From: greg@kroah.com (Greg KH)
To: linux-kernel@vger.kernel.org, sensors@Stimpy.netroedge.com
Cc: khali@linux-fr.org
Subject: [PATCH] I2C: Kill i2c_client.id (2/5)
Date: Thu, 19 May 2005 06:25:41 +0000 [thread overview]
Message-ID: <11099685932577@kroah.com> (raw)
In-Reply-To: <11099685933551@kroah.com>
ChangeSet 1.2084, 2005/03/02 11:52:15-08:00, khali@linux-fr.org
[PATCH] I2C: Kill i2c_client.id (2/5)
(2/5) Stop using i2c_client.id in media/video drivers.
Affected drivers:
* adv7170
* adv7175
* bt819
* bt856
* bttv
* cx88
* ovcamchip
* saa5246a
* saa5249
* saa7110
* saa7111
* saa7114
* saa7134
* saa7185
* tda7432
* tda9840
* tda9875
* tea6415c
* tea6420
* tuner-3036
* vpx3220
Most drivers here would include the id as part of their i2c client name
(e.g. adv7170[0]). This looks more like an habit than something really
needed, so I replaced the various printf by strlcpy, which should be
slightly faster. As said earlier, clients can be differenciated thanks
to their bus id and address if needed, so I don't think that including
this information in the client name is wise anyway.
Other drivers would either set the id to -1 or to a unique value but
then never use it. These drivers are unaffected by the changes.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/media/video/adv7170.c | 5 +----
drivers/media/video/adv7175.c | 5 +----
drivers/media/video/bt819.c | 11 +++--------
drivers/media/video/bt856.c | 5 +----
drivers/media/video/bttv-i2c.c | 1 -
drivers/media/video/cx88/cx88-i2c.c | 1 -
drivers/media/video/ovcamchip/ovcamchip_core.c | 1 -
drivers/media/video/saa5246a.c | 1 -
drivers/media/video/saa5249.c | 1 -
drivers/media/video/saa7110.c | 5 +----
drivers/media/video/saa7111.c | 5 +----
drivers/media/video/saa7114.c | 5 +----
drivers/media/video/saa7134/saa7134-i2c.c | 1 -
drivers/media/video/saa7185.c | 5 +----
drivers/media/video/tda7432.c | 1 -
drivers/media/video/tda9840.c | 4 ----
drivers/media/video/tda9875.c | 1 -
drivers/media/video/tea6415c.c | 4 ----
drivers/media/video/tea6420.c | 4 ----
drivers/media/video/tuner-3036.c | 1 -
drivers/media/video/vpx3220.c | 19 ++++++++-----------
21 files changed, 18 insertions(+), 68 deletions(-)
diff -Nru a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
--- a/drivers/media/video/adv7170.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/adv7170.c 2005-03-04 12:26:18 -08:00
@@ -402,7 +402,6 @@
.force = force
};
-static int adv7170_i2c_id = 0;
static struct i2c_driver i2c_driver_adv7170;
static int
@@ -432,7 +431,6 @@
client->adapter = adapter;
client->driver = &i2c_driver_adv7170;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = adv7170_i2c_id++;
if ((client->addr = I2C_ADV7170 >> 1) ||
(client->addr = (I2C_ADV7170 >> 1) + 1)) {
dname = adv7170_name;
@@ -444,8 +442,7 @@
kfree(client);
return 0;
}
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "%s[%d]", dname, client->id);
+ strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));
encoder = kmalloc(sizeof(struct adv7170), GFP_KERNEL);
if (encoder = NULL) {
diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
--- a/drivers/media/video/adv7175.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/adv7175.c 2005-03-04 12:26:18 -08:00
@@ -452,7 +452,6 @@
.force = force
};
-static int adv7175_i2c_id = 0;
static struct i2c_driver i2c_driver_adv7175;
static int
@@ -482,7 +481,6 @@
client->adapter = adapter;
client->driver = &i2c_driver_adv7175;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = adv7175_i2c_id++;
if ((client->addr = I2C_ADV7175 >> 1) ||
(client->addr = (I2C_ADV7175 >> 1) + 1)) {
dname = adv7175_name;
@@ -494,8 +492,7 @@
kfree(client);
return 0;
}
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "%s[%d]", dname, client->id);
+ strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));
encoder = kmalloc(sizeof(struct adv7175), GFP_KERNEL);
if (encoder = NULL) {
diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
--- a/drivers/media/video/bt819.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/bt819.c 2005-03-04 12:26:18 -08:00
@@ -517,7 +517,6 @@
.force = force
};
-static int bt819_i2c_id = 0;
static struct i2c_driver i2c_driver_bt819;
static int
@@ -546,7 +545,6 @@
client->adapter = adapter;
client->driver = &i2c_driver_bt819;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = bt819_i2c_id++;
decoder = kmalloc(sizeof(struct bt819), GFP_KERNEL);
if (decoder = NULL) {
@@ -568,16 +566,13 @@
id = bt819_read(client, 0x17);
switch (id & 0xf0) {
case 0x70:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "bt819a[%d]", client->id);
+ strlcpy(I2C_NAME(client), "bt819a", sizeof(I2C_NAME(client)));
break;
case 0x60:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "bt817a[%d]", client->id);
+ strlcpy(I2C_NAME(client), "bt817a", sizeof(I2C_NAME(client)));
break;
case 0x20:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "bt815a[%d]", client->id);
+ strlcpy(I2C_NAME(client), "bt815a", sizeof(I2C_NAME(client)));
break;
default:
dprintk(1,
diff -Nru a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
--- a/drivers/media/video/bt856.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/bt856.c 2005-03-04 12:26:18 -08:00
@@ -306,7 +306,6 @@
.force = force
};
-static int bt856_i2c_id = 0;
static struct i2c_driver i2c_driver_bt856;
static int
@@ -335,9 +334,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_bt856;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = bt856_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "bt856[%d]", client->id);
+ strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));
encoder = kmalloc(sizeof(struct bt856), GFP_KERNEL);
if (encoder = NULL) {
diff -Nru a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
--- a/drivers/media/video/bttv-i2c.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/bttv-i2c.c 2005-03-04 12:26:18 -08:00
@@ -330,7 +330,6 @@
static struct i2c_client bttv_i2c_client_template = {
I2C_DEVNAME("bttv internal"),
- .id = -1,
};
diff -Nru a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
--- a/drivers/media/video/cx88/cx88-i2c.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/cx88/cx88-i2c.c 2005-03-04 12:26:18 -08:00
@@ -141,7 +141,6 @@
static struct i2c_client cx8800_i2c_client_template = {
I2C_DEVNAME("cx88xx internal"),
- .id = -1,
};
static char *i2c_devs[128] = {
diff -Nru a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c 2005-03-04 12:26:18 -08:00
@@ -422,7 +422,6 @@
static struct i2c_client client_template = {
I2C_DEVNAME("(unset)"),
- .id = -1,
.driver = &driver,
};
diff -Nru a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
--- a/drivers/media/video/saa5246a.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa5246a.c 2005-03-04 12:26:18 -08:00
@@ -185,7 +185,6 @@
};
static struct i2c_client client_template = {
- .id = -1,
.driver = &i2c_driver_videotext,
.name = "(unset)",
};
diff -Nru a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
--- a/drivers/media/video/saa5249.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa5249.c 2005-03-04 12:26:18 -08:00
@@ -258,7 +258,6 @@
};
static struct i2c_client client_template = {
- .id = -1,
.driver = &i2c_driver_videotext,
.name = "(unset)",
};
diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
--- a/drivers/media/video/saa7110.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7110.c 2005-03-04 12:26:18 -08:00
@@ -476,7 +476,6 @@
.force = force
};
-static int saa7110_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7110;
static int
@@ -507,9 +506,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_saa7110;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7110_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7110[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL);
if (decoder = 0) {
diff -Nru a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
--- a/drivers/media/video/saa7111.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7111.c 2005-03-04 12:26:18 -08:00
@@ -500,7 +500,6 @@
.force = force
};
-static int saa7111_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7111;
static int
@@ -530,9 +529,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_saa7111;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7111_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7111[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client)));
decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL);
if (decoder = NULL) {
diff -Nru a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
--- a/drivers/media/video/saa7114.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7114.c 2005-03-04 12:26:18 -08:00
@@ -838,7 +838,6 @@
.force = force
};
-static int saa7114_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7114;
static int
@@ -871,9 +870,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_saa7114;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7114_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7114[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client)));
decoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL);
if (decoder = NULL) {
diff -Nru a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
--- a/drivers/media/video/saa7134/saa7134-i2c.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7134/saa7134-i2c.c 2005-03-04 12:26:18 -08:00
@@ -362,7 +362,6 @@
static struct i2c_client saa7134_client_template = {
I2C_DEVNAME("saa7134 internal"),
- .id = -1,
};
/* ----------------------------------------------------------- */
diff -Nru a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
--- a/drivers/media/video/saa7185.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7185.c 2005-03-04 12:26:18 -08:00
@@ -398,7 +398,6 @@
.force = force
};
-static int saa7185_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7185;
static int
@@ -427,9 +426,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_saa7185;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7185_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7185[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7185", sizeof(I2C_NAME(client)));
encoder = kmalloc(sizeof(struct saa7185), GFP_KERNEL);
if (encoder = NULL) {
diff -Nru a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
--- a/drivers/media/video/tda7432.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tda7432.c 2005-03-04 12:26:18 -08:00
@@ -528,7 +528,6 @@
static struct i2c_client client_template {
I2C_DEVNAME("tda7432"),
- .id = -1,
.driver = &driver,
};
diff -Nru a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
--- a/drivers/media/video/tda9840.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tda9840.c 2005-03-04 12:26:18 -08:00
@@ -51,9 +51,6 @@
static struct i2c_driver driver;
static struct i2c_client client_template;
-/* unique ID allocation */
-static int tda9840_id = 0;
-
static int command(struct i2c_client *client, unsigned int cmd, void *arg)
{
int result;
@@ -179,7 +176,6 @@
/* fill client structure */
memcpy(client, &client_template, sizeof(struct i2c_client));
- client->id = tda9840_id++;
client->addr = address;
client->adapter = adapter;
diff -Nru a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
--- a/drivers/media/video/tda9875.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tda9875.c 2005-03-04 12:26:18 -08:00
@@ -399,7 +399,6 @@
static struct i2c_client client_template {
I2C_DEVNAME("tda9875"),
- .id = -1,
.driver = &driver,
};
diff -Nru a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
--- a/drivers/media/video/tea6415c.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tea6415c.c 2005-03-04 12:26:18 -08:00
@@ -51,9 +51,6 @@
static struct i2c_driver driver;
static struct i2c_client client_template;
-/* unique ID allocation */
-static int tea6415c_id = 0;
-
/* this function is called by i2c_probe */
static int detect(struct i2c_adapter *adapter, int address, int kind)
{
@@ -73,7 +70,6 @@
/* fill client structure */
memcpy(client, &client_template, sizeof(struct i2c_client));
- client->id = tea6415c_id++;
client->addr = address;
client->adapter = adapter;
diff -Nru a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
--- a/drivers/media/video/tea6420.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tea6420.c 2005-03-04 12:26:18 -08:00
@@ -48,9 +48,6 @@
static struct i2c_driver driver;
static struct i2c_client client_template;
-/* unique ID allocation */
-static int tea6420_id = 0;
-
/* make a connection between the input 'i' and the output 'o'
with gain 'g' for the tea6420-client 'client' (note: i = 6 means 'mute') */
static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
@@ -111,7 +108,6 @@
/* fill client structure */
memcpy(client, &client_template, sizeof(struct i2c_client));
- client->id = tea6420_id++;
client->addr = address;
client->adapter = adapter;
diff -Nru a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
--- a/drivers/media/video/tuner-3036.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tuner-3036.c 2005-03-04 12:26:18 -08:00
@@ -192,7 +192,6 @@
static struct i2c_client client_template {
- .id = -1,
.driver = &i2c_driver_tuner,
.name = "SAB3036",
};
diff -Nru a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
--- a/drivers/media/video/vpx3220.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/vpx3220.c 2005-03-04 12:26:18 -08:00
@@ -587,7 +587,6 @@
.force = force
};
-static int vpx3220_i2c_id = 0;
static struct i2c_driver vpx3220_i2c_driver;
static int
@@ -634,7 +633,6 @@
client->adapter = adapter;
client->driver = &vpx3220_i2c_driver;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = vpx3220_i2c_id++;
/* Check for manufacture ID and part number */
if (kind < 0) {
@@ -655,16 +653,16 @@
vpx3220_read(client, 0x01);
switch (pn) {
case 0x4680:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "vpx3220a[%d]", client->id);
+ strlcpy(I2C_NAME(client), "vpx3220a",
+ sizeof(I2C_NAME(client)));
break;
case 0x4260:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "vpx3216b[%d]", client->id);
+ strlcpy(I2C_NAME(client), "vpx3216b",
+ sizeof(I2C_NAME(client)));
break;
case 0x4280:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "vpx3214c[%d]", client->id);
+ strlcpy(I2C_NAME(client), "vpx3214c",
+ sizeof(I2C_NAME(client)));
break;
default:
dprintk(1,
@@ -675,9 +673,8 @@
return 0;
}
} else {
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "forced vpx32xx[%d]",
- client->id);
+ strlcpy(I2C_NAME(client), "forced vpx32xx",
+ sizeof(I2C_NAME(client)));
}
decoder = kmalloc(sizeof(struct vpx3220), GFP_KERNEL);
WARNING: multiple messages have this Message-ID (diff)
From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org, sensors@Stimpy.netroedge.com
Cc: khali@linux-fr.org
Subject: [PATCH] I2C: Kill i2c_client.id (2/5)
Date: Fri, 4 Mar 2005 12:36:33 -0800 [thread overview]
Message-ID: <11099685932577@kroah.com> (raw)
In-Reply-To: <11099685933551@kroah.com>
ChangeSet 1.2084, 2005/03/02 11:52:15-08:00, khali@linux-fr.org
[PATCH] I2C: Kill i2c_client.id (2/5)
(2/5) Stop using i2c_client.id in media/video drivers.
Affected drivers:
* adv7170
* adv7175
* bt819
* bt856
* bttv
* cx88
* ovcamchip
* saa5246a
* saa5249
* saa7110
* saa7111
* saa7114
* saa7134
* saa7185
* tda7432
* tda9840
* tda9875
* tea6415c
* tea6420
* tuner-3036
* vpx3220
Most drivers here would include the id as part of their i2c client name
(e.g. adv7170[0]). This looks more like an habit than something really
needed, so I replaced the various printf by strlcpy, which should be
slightly faster. As said earlier, clients can be differenciated thanks
to their bus id and address if needed, so I don't think that including
this information in the client name is wise anyway.
Other drivers would either set the id to -1 or to a unique value but
then never use it. These drivers are unaffected by the changes.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/media/video/adv7170.c | 5 +----
drivers/media/video/adv7175.c | 5 +----
drivers/media/video/bt819.c | 11 +++--------
drivers/media/video/bt856.c | 5 +----
drivers/media/video/bttv-i2c.c | 1 -
drivers/media/video/cx88/cx88-i2c.c | 1 -
drivers/media/video/ovcamchip/ovcamchip_core.c | 1 -
drivers/media/video/saa5246a.c | 1 -
drivers/media/video/saa5249.c | 1 -
drivers/media/video/saa7110.c | 5 +----
drivers/media/video/saa7111.c | 5 +----
drivers/media/video/saa7114.c | 5 +----
drivers/media/video/saa7134/saa7134-i2c.c | 1 -
drivers/media/video/saa7185.c | 5 +----
drivers/media/video/tda7432.c | 1 -
drivers/media/video/tda9840.c | 4 ----
drivers/media/video/tda9875.c | 1 -
drivers/media/video/tea6415c.c | 4 ----
drivers/media/video/tea6420.c | 4 ----
drivers/media/video/tuner-3036.c | 1 -
drivers/media/video/vpx3220.c | 19 ++++++++-----------
21 files changed, 18 insertions(+), 68 deletions(-)
diff -Nru a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
--- a/drivers/media/video/adv7170.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/adv7170.c 2005-03-04 12:26:18 -08:00
@@ -402,7 +402,6 @@
.force = force
};
-static int adv7170_i2c_id = 0;
static struct i2c_driver i2c_driver_adv7170;
static int
@@ -432,7 +431,6 @@
client->adapter = adapter;
client->driver = &i2c_driver_adv7170;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = adv7170_i2c_id++;
if ((client->addr == I2C_ADV7170 >> 1) ||
(client->addr == (I2C_ADV7170 >> 1) + 1)) {
dname = adv7170_name;
@@ -444,8 +442,7 @@
kfree(client);
return 0;
}
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "%s[%d]", dname, client->id);
+ strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));
encoder = kmalloc(sizeof(struct adv7170), GFP_KERNEL);
if (encoder == NULL) {
diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
--- a/drivers/media/video/adv7175.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/adv7175.c 2005-03-04 12:26:18 -08:00
@@ -452,7 +452,6 @@
.force = force
};
-static int adv7175_i2c_id = 0;
static struct i2c_driver i2c_driver_adv7175;
static int
@@ -482,7 +481,6 @@
client->adapter = adapter;
client->driver = &i2c_driver_adv7175;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = adv7175_i2c_id++;
if ((client->addr == I2C_ADV7175 >> 1) ||
(client->addr == (I2C_ADV7175 >> 1) + 1)) {
dname = adv7175_name;
@@ -494,8 +492,7 @@
kfree(client);
return 0;
}
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "%s[%d]", dname, client->id);
+ strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));
encoder = kmalloc(sizeof(struct adv7175), GFP_KERNEL);
if (encoder == NULL) {
diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
--- a/drivers/media/video/bt819.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/bt819.c 2005-03-04 12:26:18 -08:00
@@ -517,7 +517,6 @@
.force = force
};
-static int bt819_i2c_id = 0;
static struct i2c_driver i2c_driver_bt819;
static int
@@ -546,7 +545,6 @@
client->adapter = adapter;
client->driver = &i2c_driver_bt819;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = bt819_i2c_id++;
decoder = kmalloc(sizeof(struct bt819), GFP_KERNEL);
if (decoder == NULL) {
@@ -568,16 +566,13 @@
id = bt819_read(client, 0x17);
switch (id & 0xf0) {
case 0x70:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "bt819a[%d]", client->id);
+ strlcpy(I2C_NAME(client), "bt819a", sizeof(I2C_NAME(client)));
break;
case 0x60:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "bt817a[%d]", client->id);
+ strlcpy(I2C_NAME(client), "bt817a", sizeof(I2C_NAME(client)));
break;
case 0x20:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "bt815a[%d]", client->id);
+ strlcpy(I2C_NAME(client), "bt815a", sizeof(I2C_NAME(client)));
break;
default:
dprintk(1,
diff -Nru a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
--- a/drivers/media/video/bt856.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/bt856.c 2005-03-04 12:26:18 -08:00
@@ -306,7 +306,6 @@
.force = force
};
-static int bt856_i2c_id = 0;
static struct i2c_driver i2c_driver_bt856;
static int
@@ -335,9 +334,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_bt856;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = bt856_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "bt856[%d]", client->id);
+ strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));
encoder = kmalloc(sizeof(struct bt856), GFP_KERNEL);
if (encoder == NULL) {
diff -Nru a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
--- a/drivers/media/video/bttv-i2c.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/bttv-i2c.c 2005-03-04 12:26:18 -08:00
@@ -330,7 +330,6 @@
static struct i2c_client bttv_i2c_client_template = {
I2C_DEVNAME("bttv internal"),
- .id = -1,
};
diff -Nru a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
--- a/drivers/media/video/cx88/cx88-i2c.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/cx88/cx88-i2c.c 2005-03-04 12:26:18 -08:00
@@ -141,7 +141,6 @@
static struct i2c_client cx8800_i2c_client_template = {
I2C_DEVNAME("cx88xx internal"),
- .id = -1,
};
static char *i2c_devs[128] = {
diff -Nru a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c 2005-03-04 12:26:18 -08:00
@@ -422,7 +422,6 @@
static struct i2c_client client_template = {
I2C_DEVNAME("(unset)"),
- .id = -1,
.driver = &driver,
};
diff -Nru a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
--- a/drivers/media/video/saa5246a.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa5246a.c 2005-03-04 12:26:18 -08:00
@@ -185,7 +185,6 @@
};
static struct i2c_client client_template = {
- .id = -1,
.driver = &i2c_driver_videotext,
.name = "(unset)",
};
diff -Nru a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
--- a/drivers/media/video/saa5249.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa5249.c 2005-03-04 12:26:18 -08:00
@@ -258,7 +258,6 @@
};
static struct i2c_client client_template = {
- .id = -1,
.driver = &i2c_driver_videotext,
.name = "(unset)",
};
diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
--- a/drivers/media/video/saa7110.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7110.c 2005-03-04 12:26:18 -08:00
@@ -476,7 +476,6 @@
.force = force
};
-static int saa7110_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7110;
static int
@@ -507,9 +506,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_saa7110;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7110_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7110[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL);
if (decoder == 0) {
diff -Nru a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
--- a/drivers/media/video/saa7111.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7111.c 2005-03-04 12:26:18 -08:00
@@ -500,7 +500,6 @@
.force = force
};
-static int saa7111_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7111;
static int
@@ -530,9 +529,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_saa7111;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7111_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7111[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client)));
decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL);
if (decoder == NULL) {
diff -Nru a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
--- a/drivers/media/video/saa7114.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7114.c 2005-03-04 12:26:18 -08:00
@@ -838,7 +838,6 @@
.force = force
};
-static int saa7114_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7114;
static int
@@ -871,9 +870,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_saa7114;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7114_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7114[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client)));
decoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL);
if (decoder == NULL) {
diff -Nru a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
--- a/drivers/media/video/saa7134/saa7134-i2c.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7134/saa7134-i2c.c 2005-03-04 12:26:18 -08:00
@@ -362,7 +362,6 @@
static struct i2c_client saa7134_client_template = {
I2C_DEVNAME("saa7134 internal"),
- .id = -1,
};
/* ----------------------------------------------------------- */
diff -Nru a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
--- a/drivers/media/video/saa7185.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/saa7185.c 2005-03-04 12:26:18 -08:00
@@ -398,7 +398,6 @@
.force = force
};
-static int saa7185_i2c_id = 0;
static struct i2c_driver i2c_driver_saa7185;
static int
@@ -427,9 +426,7 @@
client->adapter = adapter;
client->driver = &i2c_driver_saa7185;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = saa7185_i2c_id++;
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "saa7185[%d]", client->id);
+ strlcpy(I2C_NAME(client), "saa7185", sizeof(I2C_NAME(client)));
encoder = kmalloc(sizeof(struct saa7185), GFP_KERNEL);
if (encoder == NULL) {
diff -Nru a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
--- a/drivers/media/video/tda7432.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tda7432.c 2005-03-04 12:26:18 -08:00
@@ -528,7 +528,6 @@
static struct i2c_client client_template =
{
I2C_DEVNAME("tda7432"),
- .id = -1,
.driver = &driver,
};
diff -Nru a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
--- a/drivers/media/video/tda9840.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tda9840.c 2005-03-04 12:26:18 -08:00
@@ -51,9 +51,6 @@
static struct i2c_driver driver;
static struct i2c_client client_template;
-/* unique ID allocation */
-static int tda9840_id = 0;
-
static int command(struct i2c_client *client, unsigned int cmd, void *arg)
{
int result;
@@ -179,7 +176,6 @@
/* fill client structure */
memcpy(client, &client_template, sizeof(struct i2c_client));
- client->id = tda9840_id++;
client->addr = address;
client->adapter = adapter;
diff -Nru a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
--- a/drivers/media/video/tda9875.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tda9875.c 2005-03-04 12:26:18 -08:00
@@ -399,7 +399,6 @@
static struct i2c_client client_template =
{
I2C_DEVNAME("tda9875"),
- .id = -1,
.driver = &driver,
};
diff -Nru a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
--- a/drivers/media/video/tea6415c.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tea6415c.c 2005-03-04 12:26:18 -08:00
@@ -51,9 +51,6 @@
static struct i2c_driver driver;
static struct i2c_client client_template;
-/* unique ID allocation */
-static int tea6415c_id = 0;
-
/* this function is called by i2c_probe */
static int detect(struct i2c_adapter *adapter, int address, int kind)
{
@@ -73,7 +70,6 @@
/* fill client structure */
memcpy(client, &client_template, sizeof(struct i2c_client));
- client->id = tea6415c_id++;
client->addr = address;
client->adapter = adapter;
diff -Nru a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
--- a/drivers/media/video/tea6420.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tea6420.c 2005-03-04 12:26:18 -08:00
@@ -48,9 +48,6 @@
static struct i2c_driver driver;
static struct i2c_client client_template;
-/* unique ID allocation */
-static int tea6420_id = 0;
-
/* make a connection between the input 'i' and the output 'o'
with gain 'g' for the tea6420-client 'client' (note: i = 6 means 'mute') */
static int tea6420_switch(struct i2c_client *client, int i, int o, int g)
@@ -111,7 +108,6 @@
/* fill client structure */
memcpy(client, &client_template, sizeof(struct i2c_client));
- client->id = tea6420_id++;
client->addr = address;
client->adapter = adapter;
diff -Nru a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
--- a/drivers/media/video/tuner-3036.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/tuner-3036.c 2005-03-04 12:26:18 -08:00
@@ -192,7 +192,6 @@
static struct i2c_client client_template =
{
- .id = -1,
.driver = &i2c_driver_tuner,
.name = "SAB3036",
};
diff -Nru a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
--- a/drivers/media/video/vpx3220.c 2005-03-04 12:26:18 -08:00
+++ b/drivers/media/video/vpx3220.c 2005-03-04 12:26:18 -08:00
@@ -587,7 +587,6 @@
.force = force
};
-static int vpx3220_i2c_id = 0;
static struct i2c_driver vpx3220_i2c_driver;
static int
@@ -634,7 +633,6 @@
client->adapter = adapter;
client->driver = &vpx3220_i2c_driver;
client->flags = I2C_CLIENT_ALLOW_USE;
- client->id = vpx3220_i2c_id++;
/* Check for manufacture ID and part number */
if (kind < 0) {
@@ -655,16 +653,16 @@
vpx3220_read(client, 0x01);
switch (pn) {
case 0x4680:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "vpx3220a[%d]", client->id);
+ strlcpy(I2C_NAME(client), "vpx3220a",
+ sizeof(I2C_NAME(client)));
break;
case 0x4260:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "vpx3216b[%d]", client->id);
+ strlcpy(I2C_NAME(client), "vpx3216b",
+ sizeof(I2C_NAME(client)));
break;
case 0x4280:
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "vpx3214c[%d]", client->id);
+ strlcpy(I2C_NAME(client), "vpx3214c",
+ sizeof(I2C_NAME(client)));
break;
default:
dprintk(1,
@@ -675,9 +673,8 @@
return 0;
}
} else {
- snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
- "forced vpx32xx[%d]",
- client->id);
+ strlcpy(I2C_NAME(client), "forced vpx32xx",
+ sizeof(I2C_NAME(client)));
}
decoder = kmalloc(sizeof(struct vpx3220), GFP_KERNEL);
next prev parent reply other threads:[~2005-05-19 6:25 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-04 20:35 [BK PATCH] I2C patches for 2.6.11 Greg KH
2005-03-04 20:36 ` [PATCH] I2C: add fscpos chip driver Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Allow it87 pwm reconfiguration Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Fix up some build warnings in the fscpos driver Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Kill i2c_client.id (1/5) Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` Greg KH [this message]
2005-05-19 6:25 ` [PATCH] I2C: Kill i2c_client.id (2/5) Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Kill i2c_client.id (3/5) Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Kill i2c_client.id (4/5) Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Kill i2c_client.id (5/5) Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: just delete the id field, let's not delay it any longer Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: fix for fscpos voltage values Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: i2c-dev namespace cleanup Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: lm78 driver improvement Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Enable w83781d and w83627hf temperature channels Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Kill unused includes in i2c-sensor-detect.c Greg KH
2005-03-04 20:36 ` [PATCH] I2C: unnecessary #includes in asb100.c Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: lm80 driver improvement Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] i2c-core.c: make some code static Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: use time_after instead of comparing jiffies Greg KH
2005-03-04 20:36 ` [PATCH] I2C: add ST M41T00 I2C RTC chip driver Greg KH
2005-03-04 20:36 ` [PATCH] I2C: New chip driver: sis5595 Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: add Marvell mv64xxx i2c driver Greg KH
2005-03-04 20:36 ` [PATCH] I2C: add GL520SM Sensor Chip driver Greg KH
2005-03-04 20:36 ` [PATCH] I2C: improve debugging output Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Enable I2C_PIIX4 for 64-bit platforms Greg KH
2005-03-04 20:36 ` [PATCH] I2C: fix typo in drivers/i2c/busses/i2c-ixp4xx.c Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C i2c-nforce2: add support for nForce4 (patch against 2.6.11-rc4) Greg KH
2005-05-19 6:25 ` [PATCH] I2C i2c-nforce2: add support for nForce4 (patch against Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Remove NULL client checks in rtc8564 driver Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Make i2c list terminators explicitely unsigned Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Fix some gcc 4.0 compile failures and warnings Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: S3C2410 missing I2C_CLASS_HWMON Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: minor I2C cleanups Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] Add class definition to the elektor bus driver Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: saa7146 build fix Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: w83627hf needs i2c-isa Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: fixed up the i2c-id.h algo ids Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Change of i2c co-maintainer Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Trivial indentation fix in i2c/chips/Kconfig Greg KH
2005-03-04 22:55 ` [PATCH] I2C: Fix some gcc 4.0 compile failures and warnings Mickey Stein
2005-05-19 6:25 ` Mickey Stein
2005-03-04 23:02 ` Greg KH
2005-05-19 6:25 ` Greg KH
2005-03-05 5:57 ` [RFQ] Rules for accepting patches into the linux-releases tree Shawn Starr
2005-03-05 6:11 ` Randy.Dunlap
2005-03-05 16:33 ` Greg KH
2005-03-24 6:39 ` [2.6.11.5][BUILD] i2c.h breakage in 2.6.12-rc1 + -mm only Shawn Starr
2005-03-24 8:03 ` Greg KH
2005-03-05 11:59 ` [BK PATCH] I2C patches for 2.6.11 Jean Delvare
2005-03-06 6:55 ` Greg KH
2005-03-07 8:50 ` Adrian Bunk
2005-03-08 8:41 ` Domen Puncer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11099685932577@kroah.com \
--to=greg@kroah.com \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sensors@Stimpy.netroedge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.