diff options
author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-11-24 09:01:20 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-01-31 14:28:44 -0200 |
commit | bbdba43f202bcd724063524aef1436459af0e5ec (patch) | |
tree | 59f023323298c037b42cfe4b3a9eb1487f7e94af /drivers/media/pci/ivtv/ivtv-driver.h | |
parent | e7b3a2b22176d01db0c3b31d6389ccf542ba1967 (diff) | |
download | lwn-bbdba43f202bcd724063524aef1436459af0e5ec.tar.gz lwn-bbdba43f202bcd724063524aef1436459af0e5ec.zip |
[media] ivtv: prepare to convert to pr_foo()
Move the pr_fmt() macro to ivtv_driver.h and ensure that it
will be the first file to be included on all ivtv files.
While here, put the includes inside ivtv-driver.h on
alphabetic order.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-driver.h')
-rw-r--r-- | drivers/media/pci/ivtv/ivtv-driver.h | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h index 6b09a9514d64..1b23f9e47b8f 100644 --- a/drivers/media/pci/ivtv/ivtv-driver.h +++ b/drivers/media/pci/ivtv/ivtv-driver.h @@ -22,6 +22,8 @@ #ifndef IVTV_DRIVER_H #define IVTV_DRIVER_H +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + /* Internal header for ivtv project: * Driver for the cx23415/6 chip. * Author: Kevin Thayer (nufan_wfk at yahoo.com) @@ -36,38 +38,39 @@ * using information provided by Jiun-Kuei Jung @ AVerMedia. */ -#include <linux/module.h> -#include <linux/init.h> +#include <asm/byteorder.h> #include <linux/delay.h> -#include <linux/sched.h> +#include <linux/device.h> +#include <linux/dvb/audio.h> +#include <linux/dvb/video.h> #include <linux/fs.h> -#include <linux/pci.h> -#include <linux/interrupt.h> -#include <linux/spinlock.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/ivtv.h> +#include <linux/kernel.h> +#include <linux/kthread.h> #include <linux/list.h> -#include <linux/unistd.h> +#include <linux/module.h> +#include <linux/mutex.h> #include <linux/pagemap.h> +#include <linux/pci.h> #include <linux/scatterlist.h> -#include <linux/kthread.h> -#include <linux/mutex.h> +#include <linux/sched.h> #include <linux/slab.h> +#include <linux/spinlock.h> #include <linux/uaccess.h> -#include <asm/byteorder.h> +#include <linux/unistd.h> -#include <linux/dvb/video.h> -#include <linux/dvb/audio.h> +#include <media/drv-intf/cx2341x.h> +#include <media/i2c/ir-kbd-i2c.h> +#include <media/tuner.h> #include <media/v4l2-common.h> -#include <media/v4l2-ioctl.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-fh.h> -#include <media/tuner.h> -#include <media/drv-intf/cx2341x.h> -#include <media/i2c/ir-kbd-i2c.h> - -#include <linux/ivtv.h> +#include <media/v4l2-ioctl.h> /* Memory layout */ #define IVTV_ENCODER_OFFSET 0x00000000 |