[PATCH] I2C: Drop I2C_DEVNAME and i2c_clientname

I2C_DEVNAME and i2c_clientname were introduced in 2.5.68 [1] to help
media/video driver authors who wanted their code to be compatible with
both Linux 2.4 and 2.6. The cause of the incompatibility has gone since
[2], so I think we can get rid of them, as they tend to make the code
harder to read and longer to preprocess/compile for no more benefit.

I'd hope nobody seriously attempts to keep media/video driver compatible
across Linux trees anymore, BTW.

[1] http://marc.theaimsgroup.com/?l=linux-kernel&m=104930186524598&w=2
[2] http://www.linuxhq.com/kernel/v2.6/0-test3/include/linux/i2c.h

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index b98c64ab7c58..2de34ebf0673 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -314,7 +314,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         }
         memcpy(c, &client_template, sizeof *c);
         c->adapter = adap;
-        strcpy(i2c_clientname(c), "OV????");
+        strcpy(c->name, "OV????");
 
         ov = kmalloc(sizeof *ov, GFP_KERNEL);
         if (!ov) {
@@ -328,7 +328,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         if (rc < 0)
                 goto error;
 
-        strcpy(i2c_clientname(c), chip_names[ov->subtype]);
+        strcpy(c->name, chip_names[ov->subtype]);
 
         PDEBUG(1, "Camera chip detection complete");
 
@@ -421,7 +421,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(unset)"),
+        .name =         "(unset)",
         .driver =       &driver,
 };