tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (5819): Cleanup: reorder some includes

Some includes were added after some non-include macros, on old drivers.
Better to keep all includes at the beginning of the files. This change
also helps to make backports to properly work at the development tree.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Mauro Carvalho Chehab 18f3fa1e 7e520d09

+30 -31
+4 -4
drivers/media/video/adv7170.c
··· 38 38 #include <linux/slab.h> 39 39 #include <linux/mm.h> 40 40 #include <linux/signal.h> 41 + #include <linux/types.h> 42 + #include <linux/i2c.h> 41 43 #include <asm/io.h> 42 44 #include <asm/pgtable.h> 43 45 #include <asm/page.h> 44 - #include <linux/types.h> 46 + #include <asm/uaccess.h> 45 47 46 48 #include <linux/videodev.h> 47 - #include <asm/uaccess.h> 49 + #include <linux/video_encoder.h> 48 50 49 51 MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver"); 50 52 MODULE_AUTHOR("Maxim Yevtyushkin"); 51 53 MODULE_LICENSE("GPL"); 52 54 53 - #include <linux/i2c.h> 54 55 55 56 #define I2C_NAME(x) (x)->name 56 57 57 - #include <linux/video_encoder.h> 58 58 59 59 static int debug = 0; 60 60 module_param(debug, int, 0);
+4 -4
drivers/media/video/adv7175.c
··· 34 34 #include <linux/slab.h> 35 35 #include <linux/mm.h> 36 36 #include <linux/signal.h> 37 + #include <linux/types.h> 38 + #include <linux/i2c.h> 37 39 #include <asm/io.h> 38 40 #include <asm/pgtable.h> 39 41 #include <asm/page.h> 40 - #include <linux/types.h> 42 + #include <asm/uaccess.h> 41 43 42 44 #include <linux/videodev.h> 43 - #include <asm/uaccess.h> 45 + #include <linux/video_encoder.h> 44 46 45 47 MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver"); 46 48 MODULE_AUTHOR("Dave Perks"); 47 49 MODULE_LICENSE("GPL"); 48 50 49 - #include <linux/i2c.h> 50 51 51 52 #define I2C_NAME(s) (s)->name 52 53 53 - #include <linux/video_encoder.h> 54 54 55 55 static int debug = 0; 56 56 module_param(debug, int, 0);
+5 -4
drivers/media/video/bt819.c
··· 38 38 #include <linux/slab.h> 39 39 #include <linux/mm.h> 40 40 #include <linux/signal.h> 41 + #include <linux/types.h> 42 + #include <linux/i2c.h> 41 43 #include <asm/io.h> 42 44 #include <asm/pgtable.h> 43 45 #include <asm/page.h> 44 - #include <linux/types.h> 46 + #include <asm/uaccess.h> 45 47 46 48 #include <linux/videodev.h> 47 - #include <asm/uaccess.h> 49 + #include <linux/video_decoder.h> 50 + 48 51 49 52 MODULE_DESCRIPTION("Brooktree-819 video decoder driver"); 50 53 MODULE_AUTHOR("Mike Bernson & Dave Perks"); 51 54 MODULE_LICENSE("GPL"); 52 55 53 - #include <linux/i2c.h> 54 56 55 57 #define I2C_NAME(s) (s)->name 56 58 57 - #include <linux/video_decoder.h> 58 59 59 60 static int debug = 0; 60 61 module_param(debug, int, 0);
+4 -4
drivers/media/video/bt856.c
··· 38 38 #include <linux/slab.h> 39 39 #include <linux/mm.h> 40 40 #include <linux/signal.h> 41 + #include <linux/types.h> 42 + #include <linux/i2c.h> 43 + #include <linux/video_encoder.h> 41 44 #include <asm/io.h> 42 45 #include <asm/pgtable.h> 43 46 #include <asm/page.h> 44 - #include <linux/types.h> 47 + #include <asm/uaccess.h> 45 48 46 49 #include <linux/videodev.h> 47 - #include <asm/uaccess.h> 48 50 49 51 MODULE_DESCRIPTION("Brooktree-856A video encoder driver"); 50 52 MODULE_AUTHOR("Mike Bernson & Dave Perks"); 51 53 MODULE_LICENSE("GPL"); 52 54 53 - #include <linux/i2c.h> 54 55 55 56 #define I2C_NAME(s) (s)->name 56 57 57 - #include <linux/video_encoder.h> 58 58 59 59 static int debug = 0; 60 60 module_param(debug, int, 0);
+1 -1
drivers/media/video/bt8xx/bttvp.h
··· 33 33 #include <linux/i2c.h> 34 34 #include <linux/i2c-algo-bit.h> 35 35 #include <linux/videodev.h> 36 - #include <media/v4l2-common.h> 37 36 #include <linux/pci.h> 38 37 #include <linux/input.h> 39 38 #include <linux/mutex.h> 40 39 #include <asm/scatterlist.h> 41 40 #include <asm/io.h> 41 + #include <media/v4l2-common.h> 42 42 43 43 #include <linux/device.h> 44 44 #include <media/video-buf.h>
+4 -4
drivers/media/video/saa7111.c
··· 37 37 #include <linux/slab.h> 38 38 #include <linux/mm.h> 39 39 #include <linux/signal.h> 40 + #include <linux/types.h> 41 + #include <linux/i2c.h> 40 42 #include <asm/io.h> 41 43 #include <asm/pgtable.h> 42 44 #include <asm/page.h> 43 - #include <linux/types.h> 45 + #include <asm/uaccess.h> 44 46 45 47 #include <linux/videodev.h> 46 - #include <asm/uaccess.h> 48 + #include <linux/video_decoder.h> 47 49 48 50 MODULE_DESCRIPTION("Philips SAA7111 video decoder driver"); 49 51 MODULE_AUTHOR("Dave Perks"); 50 52 MODULE_LICENSE("GPL"); 51 53 52 - #include <linux/i2c.h> 53 54 54 55 #define I2C_NAME(s) (s)->name 55 56 56 - #include <linux/video_decoder.h> 57 57 58 58 static int debug = 0; 59 59 module_param(debug, int, 0644);
+4 -6
drivers/media/video/saa7114.c
··· 35 35 #include <linux/fs.h> 36 36 #include <linux/kernel.h> 37 37 #include <linux/major.h> 38 - 39 38 #include <linux/slab.h> 40 - 41 39 #include <linux/mm.h> 42 40 #include <linux/signal.h> 41 + #include <linux/types.h> 42 + #include <linux/i2c.h> 43 43 #include <asm/io.h> 44 44 #include <asm/pgtable.h> 45 45 #include <asm/page.h> 46 - #include <linux/types.h> 46 + #include <asm/uaccess.h> 47 47 48 48 #include <linux/videodev.h> 49 - #include <asm/uaccess.h> 49 + #include <linux/video_decoder.h> 50 50 51 51 MODULE_DESCRIPTION("Philips SAA7114H video decoder driver"); 52 52 MODULE_AUTHOR("Maxim Yevtyushkin"); 53 53 MODULE_LICENSE("GPL"); 54 54 55 - #include <linux/i2c.h> 56 55 57 56 #define I2C_NAME(x) (x)->name 58 57 59 - #include <linux/video_decoder.h> 60 58 61 59 static int debug = 0; 62 60 module_param(debug, int, 0);
+4 -4
drivers/media/video/saa7185.c
··· 34 34 #include <linux/slab.h> 35 35 #include <linux/mm.h> 36 36 #include <linux/signal.h> 37 + #include <linux/types.h> 38 + #include <linux/i2c.h> 37 39 #include <asm/io.h> 38 40 #include <asm/pgtable.h> 39 41 #include <asm/page.h> 40 - #include <linux/types.h> 42 + #include <asm/uaccess.h> 41 43 42 44 #include <linux/videodev.h> 43 - #include <asm/uaccess.h> 45 + #include <linux/video_encoder.h> 44 46 45 47 MODULE_DESCRIPTION("Philips SAA7185 video encoder driver"); 46 48 MODULE_AUTHOR("Dave Perks"); 47 49 MODULE_LICENSE("GPL"); 48 50 49 - #include <linux/i2c.h> 50 51 51 52 #define I2C_NAME(s) (s)->name 52 53 53 - #include <linux/video_encoder.h> 54 54 55 55 static int debug = 0; 56 56 module_param(debug, int, 0);