Fix video drivers for i2c 'name' move

drivers/media/video/adv7170.c

@@ -59,7 +59,7 @@ MODULE_LICENSE("GPL");
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(x) (x)->dev.name
+#define I2C_NAME(x) (x)->name
 
 #include <linux/video_encoder.h>
 

drivers/media/video/adv7175.c

@@ -55,7 +55,7 @@ MODULE_LICENSE("GPL");
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(s) (s)->dev.name
+#define I2C_NAME(s) (s)->name
 
 #include <linux/video_encoder.h>
 

drivers/media/video/bt819.c

@@ -59,7 +59,7 @@ MODULE_LICENSE("GPL");
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(s) (s)->dev.name
+#define I2C_NAME(s) (s)->name
 
 #include <linux/video_decoder.h>
 

drivers/media/video/bt856.c

@@ -59,7 +59,7 @@ MODULE_LICENSE("GPL");
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(s) (s)->dev.name
+#define I2C_NAME(s) (s)->name
 
 #include <linux/video_encoder.h>
 

drivers/media/video/saa7110.c

@@ -42,7 +42,7 @@ MODULE_LICENSE("GPL");
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(s) (s)->dev.name
+#define I2C_NAME(s) (s)->name
 
 #include <linux/videodev.h>
 #include <linux/video_decoder.h>

drivers/media/video/saa7111.c

@@ -55,7 +55,7 @@ MODULE_LICENSE("GPL");
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(s) (s)->dev.name
+#define I2C_NAME(s) (s)->name
 
 #include <linux/video_decoder.h>
 

drivers/media/video/saa7114.c

@@ -61,7 +61,7 @@ MODULE_LICENSE("GPL");
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(x) (x)->dev.name
+#define I2C_NAME(x) (x)->name
 
 #include <linux/video_decoder.h>
 

drivers/media/video/saa7185.c

@@ -55,7 +55,7 @@ MODULE_LICENSE("GPL");
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(s) (s)->dev.name
+#define I2C_NAME(s) (s)->name
 
 #include <linux/video_encoder.h>
 

drivers/media/video/tvmixer.c

@@ -291,7 +291,7 @@ static int tvmixer_clients(struct i2c_client *client)
 	devices[i].count = 0;
 	devices[i].dev   = client;
 	printk("tvmixer: %s (%s) registered with minor %d\n",
-	       client->dev.name,client->adapter->dev.name,minor);
+	       client->name,client->adapter->name,minor);
 	
 	return 0;
 }

drivers/media/video/vpx3220.c

@@ -33,7 +33,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
 
-#define I2C_NAME(x) (x)->dev.name
+#define I2C_NAME(x) (x)->name
 
 #include <linux/videodev.h>
 #include <linux/video_decoder.h>

drivers/media/video/zoran.h

@@ -146,11 +146,7 @@ Private IOCTL to set up for displaying MJPEG
 
 #define ZORAN_NAME    "ZORAN"	/* name of the device */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define ZR_DEVNAME(zr) (zr)->name
-#else
-#define ZR_DEVNAME(zr) (zr)->pci_dev->dev.name
-#endif
+#define ZR_DEVNAME(zr) pci_name((zr)->pci_dev)
 
 #define   BUZ_MAX_WIDTH   (zr->timing->Wa)
 #define   BUZ_MAX_HEIGHT  (zr->timing->Ha)

drivers/media/video/zoran_card.c

@@ -54,7 +54,7 @@
 #include "zoran_device.h"
 #include "zoran_procfs.h"
 
-#define I2C_NAME(x) (x)->dev.name
+#define I2C_NAME(x) (x)->name
 
 extern const struct zoran_format zoran_formats[];
 extern const int zoran_num_formats;