Re: [PATCH] i2c driver changes for 2.5.66

Greg KH
2003-03-25T01:29:56Z

ChangeSet 1.889.357.7, 2003/03/21 16:26:04-08:00, greg@kroah.com

i2c: actually register the i2c client device with the driver core.

We have to initialize the client structure with 0 to keep the
driver core from oopsing.

Now everything is hooked up enough to start removing the i2c sysctl
and proc crud.

drivers/i2c/chips/adm1021.c | 2 ++
drivers/i2c/chips/lm75.c | 2 ++
drivers/i2c/i2c-core.c | 10 ++++++++++
3 files changed, 14 insertions(+)

diff -Nru a/drivers/i2c/chips/adm1021.c b/drivers/i2c/chips/adm1021.c
--- a/drivers/i2c/chips/adm1021.c Mon Mar 24 17:27:59 2003
+++ b/drivers/i2c/chips/adm1021.c Mon Mar 24 17:27:59 2003
@@ -221,6 +221,8 @@
err = -ENOMEM;
goto error0;
}
+ memset(new_client, 0x00, sizeof(struct i2c_client) +
+ sizeof(struct adm1021_data));

data = (struct adm1021_data *) (new_client + 1);
i2c_set_clientdata(new_client, data);
diff -Nru a/drivers/i2c/chips/lm75.c b/drivers/i2c/chips/lm75.c
--- a/drivers/i2c/chips/lm75.c Mon Mar 24 17:27:59 2003
+++ b/drivers/i2c/chips/lm75.c Mon Mar 24 17:27:59 2003
@@ -140,6 +140,8 @@
err = -ENOMEM;
goto error0;
}
+ memset(new_client, 0x00, sizeof(struct i2c_client) +
+ sizeof(struct lm75_data));

data = (struct lm75_data *) (new_client + 1);
i2c_set_clientdata(new_client, data);
diff -Nru a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
--- a/drivers/i2c/i2c-core.c Mon Mar 24 17:27:59 2003
+++ b/drivers/i2c/i2c-core.c Mon Mar 24 17:27:59 2003
@@ -378,6 +378,15 @@

if (client->flags & I2C_CLIENT_ALLOW_USE)
client->usage_count = 0;
+
+ client->dev.parent = &client->adapter->dev;
+ client->dev.driver = &client->driver->driver;
+ client->dev.bus = &i2c_bus_type;
+
+ snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id), "i2c_dev_%d", i);
+ printk("registering %s\n", client->dev.bus_id);
+ device_register(&client->dev);
+
return 0;
}

@@ -414,6 +423,7 @@
res = -ENODEV;

out_unlock:
+ device_unregister(&client->dev);
up(&adapter->list);
out:
return res;