Fix video drivers for i2c 'name' move

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index fabd43bbf2823849635403a2e71d9415f498f9ca..38b508cff4d244e408ca07538564218c7f36f11a 100644 (file)
--- a/drivers/media/video/adv7170.c
+++ b/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>
 

diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index fd807e0e78d4017894de1d8e1d80c35722ef3d8e..51a0c9b711dd9d3829865e3172beae4c9154a35d 100644 (file)
--- a/drivers/media/video/adv7175.c
+++ b/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>
 

diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 3f95d3e50a6c90ad815a99a39fb708cacdcd3c64..a7836d4afb276269a4f1c5627fd27951f866b46b 100644 (file)
--- a/drivers/media/video/bt819.c
+++ b/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>
 

diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index a19a5aa1986f056d5147d1b00e09ffbbe623f0e6..f3a71267ba8f6fd28ac97267930bc55149afb38a 100644 (file)
--- a/drivers/media/video/bt856.c
+++ b/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>
 

diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 99aaad69dc066b61b9f17c08a95f8cc5a34f8377..4ab1e76f3304d40fa8b9cb361517cf3e8ff09ed5 100644 (file)
--- a/drivers/media/video/saa7110.c
+++ b/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>

diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 1fd2bb5297914e6c5c1e6a29664d6a75fe2e427a..834cfd6ad7edaac02e8e961317df8c045ad5c911 100644 (file)
--- a/drivers/media/video/saa7111.c
+++ b/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>
 

diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 9ab344d8c40640c1f5ebd76c4cac9a261e779de6..7f0c1f1e2075ec48ec2d7ea9a8632f72fab30a0e 100644 (file)
--- a/drivers/media/video/saa7114.c
+++ b/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>
 

diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 9ac7754fed1f1fccee7e941d6d153f5f2f5fde83..f7e4a47b0e53107a72bf6c0a3b0e051d7a1d398c 100644 (file)
--- a/drivers/media/video/saa7185.c
+++ b/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>
 

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 2b6fb3416142e2e13f656420bbe88c29fd060d8c..05d9d68703194347531b4076eb8cfce7b606670b 100644 (file)
--- a/drivers/media/video/tvmixer.c
+++ b/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;
 }

diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 5af57f799f4f1a65c267ca2646735801e26224d1..29eaa94adfc4b54d82113f79e1a52f5b9785468f 100644 (file)
--- a/drivers/media/video/vpx3220.c
+++ b/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>

diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 73c651475d5b1a65797dcc1c60a536bab3b68896..53ddb02179d59cf880861f76f0579b6c76a06cc5 100644 (file)
--- a/drivers/media/video/zoran.h
+++ b/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)

diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 062c3156852d545f3498a03c358e6a615f5c7e78..71600724ac2642f6a6125fb05881da323d08fa20 100644 (file)
--- a/drivers/media/video/zoran_card.c
+++ b/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;