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 (3/5)
Date: Fri, 4 Mar 2005 12:36:33 -0800 [thread overview]
Message-ID: <11099685933363@kroah.com> (raw)
In-Reply-To: <11099685932577@kroah.com>
ChangeSet 1.2085, 2005/03/02 11:52:31-08:00, khali@linux-fr.org
[PATCH] I2C: Kill i2c_client.id (3/5)
(3/5) Stop using i2c_client.id in misc drivers.
Affected drivers:
* acorn/char/pcf8583
* acorn/char/i2c
* i2c/i2c-dev
* macintosh/therm_windtunnel
* sound/oss/dmasound/dac3550a
* sound/ppc/keywest
The Acorn pcf8583 driver would give the i2c_client id the same value as
the i2c_driver id, and later test that client id (in i2c). I changed it
to test the client's driver id instead. The result is the same and the
client id is then useless and can be removed.
All other drivers here would allocate the client id to some value and
then never use it. They are unaffected by the change.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
drivers/acorn/char/i2c.c | 2 +-
drivers/acorn/char/pcf8583.c | 1 -
drivers/i2c/i2c-dev.c | 1 -
drivers/macintosh/therm_windtunnel.c | 4 ----
sound/oss/dmasound/dac3550a.c | 4 ----
sound/ppc/keywest.c | 2 --
6 files changed, 1 insertion(+), 13 deletions(-)
diff -Nru a/drivers/acorn/char/i2c.c b/drivers/acorn/char/i2c.c
--- a/drivers/acorn/char/i2c.c 2005-03-04 12:26:11 -08:00
+++ b/drivers/acorn/char/i2c.c 2005-03-04 12:26:11 -08:00
@@ -313,7 +313,7 @@
static int ioc_client_reg(struct i2c_client *client)
{
- if (client->id == I2C_DRIVERID_PCF8583 &&
+ if (client->driver->id == I2C_DRIVERID_PCF8583 &&
client->addr == 0x50) {
struct rtc_tm rtctm;
unsigned int year;
diff -Nru a/drivers/acorn/char/pcf8583.c b/drivers/acorn/char/pcf8583.c
--- a/drivers/acorn/char/pcf8583.c 2005-03-04 12:26:11 -08:00
+++ b/drivers/acorn/char/pcf8583.c 2005-03-04 12:26:11 -08:00
@@ -51,7 +51,6 @@
return -ENOMEM;
memset(c, 0, sizeof(*c));
- c->id = pcf8583_driver.id;
c->addr = addr;
c->adapter = adap;
c->driver = &pcf8583_driver;
diff -Nru a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
--- a/drivers/i2c/i2c-dev.c 2005-03-04 12:26:11 -08:00
+++ b/drivers/i2c/i2c-dev.c 2005-03-04 12:26:11 -08:00
@@ -507,7 +507,6 @@
static struct i2c_client i2cdev_client_template = {
.name = "I2C /dev entry",
- .id = 1,
.addr = -1,
.driver = &i2cdev_driver,
};
diff -Nru a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
--- a/drivers/macintosh/therm_windtunnel.c 2005-03-04 12:26:11 -08:00
+++ b/drivers/macintosh/therm_windtunnel.c 2005-03-04 12:26:11 -08:00
@@ -47,8 +47,6 @@
#define LOG_TEMP 0 /* continously log temperature */
#define I2C_DRIVERID_G4FAN 0x9001 /* fixme */
-#define THERMOSTAT_CLIENT_ID 1
-#define FAN_CLIENT_ID 2
static int do_probe( struct i2c_adapter *adapter, int addr, int kind);
@@ -372,7 +370,6 @@
goto out;
printk("ADM1030 fan controller [@%02x]\n", cl->addr );
- cl->id = FAN_CLIENT_ID;
strlcpy( cl->name, "ADM1030 fan controller", sizeof(cl->name) );
if( !i2c_attach_client(cl) )
@@ -412,7 +409,6 @@
x.overheat_temp = os_temp;
x.overheat_hyst = hyst_temp;
- cl->id = THERMOSTAT_CLIENT_ID;
strlcpy( cl->name, "DS1775 thermostat", sizeof(cl->name) );
if( !i2c_attach_client(cl) )
diff -Nru a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c
--- a/sound/oss/dmasound/dac3550a.c 2005-03-04 12:26:11 -08:00
+++ b/sound/oss/dmasound/dac3550a.c 2005-03-04 12:26:11 -08:00
@@ -40,9 +40,6 @@
static int daca_detect_client(struct i2c_adapter *adapter, int address);
static int daca_detach_client(struct i2c_client *client);
-/* Unique ID allocation */
-static int daca_id;
-
struct i2c_driver daca_driver = {
.owner = THIS_MODULE,
.name = "DAC3550A driver V " DACA_VERSION,
@@ -176,7 +173,6 @@
new_client->driver = &daca_driver;
new_client->flags = 0;
strcpy(new_client->name, client_name);
- new_client->id = daca_id++; /* racy... */
if (daca_init_client(new_client))
goto bail;
diff -Nru a/sound/ppc/keywest.c b/sound/ppc/keywest.c
--- a/sound/ppc/keywest.c 2005-03-04 12:26:11 -08:00
+++ b/sound/ppc/keywest.c 2005-03-04 12:26:11 -08:00
@@ -76,8 +76,6 @@
new_client->flags = 0;
strcpy(i2c_device_name(new_client), keywest_ctx->name);
-
- new_client->id = keywest_ctx->id++; /* Automatically unique */
keywest_ctx->client = new_client;
/* Tell the i2c layer a new client has arrived */
next prev parent reply other threads:[~2005-03-04 23:17 UTC|newest]
Thread overview: 49+ 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-03-04 20:36 ` [PATCH] I2C: Allow it87 pwm reconfiguration Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Fix up some build warnings in the fscpos driver Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Kill i2c_client.id (1/5) Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Kill i2c_client.id (2/5) Greg KH
2005-03-04 20:36 ` Greg KH [this message]
2005-03-04 20:36 ` [PATCH] I2C: Kill i2c_client.id (4/5) Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Kill i2c_client.id (5/5) Greg KH
2005-03-04 20:36 ` [PATCH] I2C: just delete the id field, let's not delay it any longer Greg KH
2005-03-04 20:36 ` [PATCH] I2C: fix for fscpos voltage values Greg KH
2005-03-04 20:36 ` [PATCH] I2C: i2c-dev namespace cleanup Greg KH
2005-03-04 20:36 ` [PATCH] I2C: lm78 driver improvement 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-03-04 20:36 ` [PATCH] I2C: lm80 driver improvement Greg KH
2005-03-04 20:36 ` [PATCH] i2c-core.c: make some code static 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-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-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-03-04 20:36 ` [PATCH] I2C i2c-nforce2: add support for nForce4 (patch against 2.6.11-rc4) Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Remove NULL client checks in rtc8564 driver Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Make i2c list terminators explicitely unsigned Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Fix some gcc 4.0 compile failures and warnings Greg KH
2005-03-04 20:36 ` [PATCH] I2C: S3C2410 missing I2C_CLASS_HWMON Greg KH
2005-03-04 20:36 ` [PATCH] I2C: minor I2C cleanups Greg KH
2005-03-04 20:36 ` [PATCH] Add class definition to the elektor bus driver Greg KH
2005-03-04 20:36 ` [PATCH] I2C: saa7146 build fix Greg KH
2005-03-04 20:36 ` [PATCH] I2C: w83627hf needs i2c-isa Greg KH
2005-03-04 20:36 ` [PATCH] I2C: fixed up the i2c-id.h algo ids Greg KH
2005-03-04 20:36 ` [PATCH] I2C: Change of i2c co-maintainer 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-03-04 23:02 ` 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=11099685933363@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox