diff options
author | David Brownell <david-b@pacbell.net> | 2007-05-01 17:26:28 -0400 |
---|---|---|
committer | Jean Delvare <khali@hyperion.delvare> | 2007-05-01 17:26:28 -0400 |
commit | 16ffadfc680bd0683dc88573c1d72cbf1e27030e (patch) | |
tree | 4cf309680cc92b7906f0e069b12a6fdf09b9c408 /drivers/i2c/busses/i2c-isa.c | |
parent | 2096b956d24c4b5950b808fc23b218425d79ebb1 (diff) |
i2c: Class attribute cleanup
This patch is a minor cleanup/code shrink, using class infrastructure
in i2c-core to manage the i2c_adapter attribute.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-isa.c')
-rw-r--r-- | drivers/i2c/busses/i2c-isa.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c index 745830bb8e2b..819e8991f276 100644 --- a/drivers/i2c/busses/i2c-isa.c +++ b/drivers/i2c/busses/i2c-isa.c | |||
@@ -64,16 +64,6 @@ static u32 isa_func(struct i2c_adapter *adapter) | |||
64 | } | 64 | } |
65 | 65 | ||
66 | 66 | ||
67 | /* Copied from i2c-core */ | ||
68 | static ssize_t show_adapter_name(struct device *dev, | ||
69 | struct device_attribute *attr, char *buf) | ||
70 | { | ||
71 | struct i2c_adapter *adap = dev_to_i2c_adapter(dev); | ||
72 | return sprintf(buf, "%s\n", adap->name); | ||
73 | } | ||
74 | static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL); | ||
75 | |||
76 | |||
77 | /* We implement an interface which resembles i2c_{add,del}_driver, | 67 | /* We implement an interface which resembles i2c_{add,del}_driver, |
78 | but for i2c-isa drivers. We don't have to remember and handle lists | 68 | but for i2c-isa drivers. We don't have to remember and handle lists |
79 | of drivers and adapters so this is much more simple, of course. */ | 69 | of drivers and adapters so this is much more simple, of course. */ |
@@ -146,20 +136,11 @@ static int __init i2c_isa_init(void) | |||
146 | printk(KERN_ERR "i2c-isa: Failed to register device\n"); | 136 | printk(KERN_ERR "i2c-isa: Failed to register device\n"); |
147 | goto exit; | 137 | goto exit; |
148 | } | 138 | } |
149 | err = device_create_file(&isa_adapter.dev, &dev_attr_name); | ||
150 | if (err) { | ||
151 | printk(KERN_ERR "i2c-isa: Failed to create name file\n"); | ||
152 | goto exit_unregister; | ||
153 | } | ||
154 | 139 | ||
155 | dev_dbg(&isa_adapter.dev, "%s registered\n", isa_adapter.name); | 140 | dev_dbg(&isa_adapter.dev, "%s registered\n", isa_adapter.name); |
156 | 141 | ||
157 | return 0; | 142 | return 0; |
158 | 143 | ||
159 | exit_unregister: | ||
160 | init_completion(&isa_adapter.dev_released); /* Needed? */ | ||
161 | device_unregister(&isa_adapter.dev); | ||
162 | wait_for_completion(&isa_adapter.dev_released); | ||
163 | exit: | 144 | exit: |
164 | return err; | 145 | return err; |
165 | } | 146 | } |
@@ -187,7 +168,6 @@ static void __exit i2c_isa_exit(void) | |||
187 | /* Clean up the sysfs representation */ | 168 | /* Clean up the sysfs representation */ |
188 | dev_dbg(&isa_adapter.dev, "Unregistering from sysfs\n"); | 169 | dev_dbg(&isa_adapter.dev, "Unregistering from sysfs\n"); |
189 | init_completion(&isa_adapter.dev_released); | 170 | init_completion(&isa_adapter.dev_released); |
190 | device_remove_file(&isa_adapter.dev, &dev_attr_name); | ||
191 | device_unregister(&isa_adapter.dev); | 171 | device_unregister(&isa_adapter.dev); |
192 | 172 | ||
193 | /* Wait for sysfs to drop all references */ | 173 | /* Wait for sysfs to drop all references */ |