[prev in list] [next in list] [prev in thread] [next in thread]
List: linux-i2c
Subject: [i2c] [patch 2.6.19-rc6 2/11] i2c-isa class driver updates
From: david-b () pacbell ! net (David Brownell)
Date: 2006-11-25 22:56:44
Message-ID: 200611251456.45116.david-b () pacbell ! net
[Download RAW message or body]
Make the i2c-isa driver stop using i2c_adapter.drivers; and use
the i2c_adapter class better. A net minor code shrink.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
----
This is split out from the other adapter patches because the changes
here are not purely cosmetic. Some of those now-removed interfaces
seem to have been exported purely for use by this driver.
drivers/i2c/busses/i2c-isa.c | 77 ++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 43 deletions(-)
Index: at91/drivers/i2c/busses/i2c-isa.c
===================================================================
--- at91.orig/drivers/i2c/busses/i2c-isa.c 2006-11-25 08:05:32.000000000 -0800
+++ at91/drivers/i2c/busses/i2c-isa.c 2006-11-25 08:05:49.000000000 -0800
@@ -40,6 +40,7 @@
#include <linux/i2c-isa.h>
#include <linux/platform_device.h>
+
static u32 isa_func(struct i2c_adapter *adapter);
/* This is the actual algorithm we define */
@@ -56,21 +57,24 @@ static struct i2c_adapter isa_adapter =
.name = "ISA main adapter",
};
-/* We can't do a thing... */
-static u32 isa_func(struct i2c_adapter *adapter)
+static void i2c_isa_dev_release(struct device *dev)
{
- return 0;
+ complete(&isa_adapter.dev_released);
}
+static struct platform_device i2c_isa_dev = {
+ .name = "i2c_isa",
+ .id = -1,
+ .dev = {
+ .release = i2c_isa_dev_release,
+ },
+};
-/* Copied from i2c-core */
-static ssize_t show_adapter_name(struct device *dev,
- struct device_attribute *attr, char *buf)
+/* We can't do a thing... */
+static u32 isa_func(struct i2c_adapter *adapter)
{
- struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
- return sprintf(buf, "%s\n", adap->name);
+ return 0;
}
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
/* We implement an interface which resembles i2c_{add,del}_driver,
@@ -86,12 +90,13 @@ int i2c_isa_add_driver(struct i2c_driver
res = driver_register(&driver->driver);
if (res)
return res;
- dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->driver.name);
+ dev_dbg(&i2c_isa_dev.dev, "Driver %s registered\n",
+ driver->driver.name);
/* Now look for clients */
res = driver->attach_adapter(&isa_adapter);
if (res) {
- dev_dbg(&isa_adapter.dev,
+ dev_dbg(&i2c_isa_dev.dev,
"Driver %s failed to attach adapter, unregistering\n",
driver->driver.name);
driver_unregister(&driver->driver);
@@ -110,10 +115,10 @@ int i2c_isa_del_driver(struct i2c_driver
client = list_entry(item, struct i2c_client, list);
if (client->driver != driver)
continue;
- dev_dbg(&isa_adapter.dev, "Detaching client %s at 0x%x\n",
+ dev_dbg(&i2c_isa_dev.dev, "Detaching client %s at 0x%x\n",
client->name, client->addr);
if ((res = driver->detach_client(client))) {
- dev_err(&isa_adapter.dev, "Failed, driver "
+ dev_err(&i2c_isa_dev.dev, "Failed, driver "
"%s not unregistered!\n",
driver->driver.name);
return res;
@@ -122,7 +127,7 @@ int i2c_isa_del_driver(struct i2c_driver
/* Get the driver off the core list */
driver_unregister(&driver->driver);
- dev_dbg(&isa_adapter.dev, "Driver %s unregistered\n", driver->driver.name);
+ dev_dbg(&i2c_isa_dev.dev, "Driver %s unregistered\n", driver->driver.name);
return 0;
}
@@ -134,44 +139,33 @@ static int __init i2c_isa_init(void)
mutex_init(&isa_adapter.clist_lock);
INIT_LIST_HEAD(&isa_adapter.clients);
+ init_completion(&isa_adapter.dev_released);
+ init_completion(&isa_adapter.class_dev_released);
isa_adapter.nr = ANY_I2C_ISA_BUS;
- isa_adapter.dev.parent = &platform_bus;
- sprintf(isa_adapter.dev.bus_id, "i2c-%d", isa_adapter.nr);
- isa_adapter.dev.driver = &i2c_adapter_driver;
- isa_adapter.dev.release = &i2c_adapter_dev_release;
- err = device_register(&isa_adapter.dev);
+ sprintf(isa_adapter.class_dev.class_id, "i2c-%d", isa_adapter.nr);
+
+ err = platform_device_register(&i2c_isa_dev);
if (err) {
printk(KERN_ERR "i2c-isa: Failed to register device\n");
goto exit;
}
- err = device_create_file(&isa_adapter.dev, &dev_attr_name);
- if (err) {
- printk(KERN_ERR "i2c-isa: Failed to create name file\n");
- goto exit_unregister;
- }
/* Add this adapter to the i2c_adapter class */
- memset(&isa_adapter.class_dev, 0x00, sizeof(struct class_device));
- isa_adapter.class_dev.dev = &isa_adapter.dev;
+ isa_adapter.class_dev.dev = &i2c_isa_dev.dev;
isa_adapter.class_dev.class = &i2c_adapter_class;
- strlcpy(isa_adapter.class_dev.class_id, isa_adapter.dev.bus_id,
- BUS_ID_SIZE);
err = class_device_register(&isa_adapter.class_dev);
if (err) {
printk(KERN_ERR "i2c-isa: Failed to register class device\n");
- goto exit_remove_name;
+ goto exit_unregister;
}
- dev_dbg(&isa_adapter.dev, "%s registered\n", isa_adapter.name);
+ dev_dbg(&i2c_isa_dev.dev, "%s registered\n", isa_adapter.name);
return 0;
-exit_remove_name:
- device_remove_file(&isa_adapter.dev, &dev_attr_name);
exit_unregister:
- init_completion(&isa_adapter.dev_released); /* Needed? */
- device_unregister(&isa_adapter.dev);
+ platform_device_unregister(&i2c_isa_dev);
wait_for_completion(&isa_adapter.dev_released);
exit:
return err;
@@ -186,10 +180,10 @@ static void __exit i2c_isa_exit(void)
/* There should be no more active client */
#ifdef DEBUG
- dev_dbg(&isa_adapter.dev, "Looking for clients\n");
+ dev_dbg(&i2c_isa_dev.dev, "Looking for clients\n");
list_for_each_safe(item, _n, &isa_adapter.clients) {
client = list_entry(item, struct i2c_client, list);
- dev_err(&isa_adapter.dev, "Driver %s still has an active "
+ dev_err(&i2c_isa_dev.dev, "Driver %s still has an active "
"ISA client at 0x%x\n", client->driver->driver.name,
client->addr);
}
@@ -198,19 +192,16 @@ static void __exit i2c_isa_exit(void)
#endif
/* Clean up the sysfs representation */
- dev_dbg(&isa_adapter.dev, "Unregistering from sysfs\n");
- init_completion(&isa_adapter.dev_released);
- init_completion(&isa_adapter.class_dev_released);
+ dev_dbg(&i2c_isa_dev.dev, "Unregistering from sysfs\n");
class_device_unregister(&isa_adapter.class_dev);
- device_remove_file(&isa_adapter.dev, &dev_attr_name);
- device_unregister(&isa_adapter.dev);
+ platform_device_unregister(&i2c_isa_dev);
/* Wait for sysfs to drop all references */
- dev_dbg(&isa_adapter.dev, "Waiting for sysfs completion\n");
+ dev_dbg(&i2c_isa_dev.dev, "Waiting for sysfs completion\n");
wait_for_completion(&isa_adapter.dev_released);
wait_for_completion(&isa_adapter.class_dev_released);
- dev_dbg(&isa_adapter.dev, "%s unregistered\n", isa_adapter.name);
+ dev_dbg(&i2c_isa_dev.dev, "%s unregistered\n", isa_adapter.name);
}
EXPORT_SYMBOL(i2c_isa_add_driver);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic