aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-powermac.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-27 15:59:38 -0500
committerWolfram Sang <w.sang@pengutronix.de>2012-12-22 14:13:45 -0500
commit0b255e927d47b550620dfd3475ee74b0f52e09c8 (patch)
tree79927f5e46b3a196f90c2b93494bb88c35ad06ea /drivers/i2c/busses/i2c-powermac.c
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff)
i2c: remove __dev* attributes from subsystem
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Peter Korsgaard <peter.korsgaard@barco.com> (for ocores and mux-gpio) Acked-by: Havard Skinnemoen <hskinnemoen@gmail.com> (for i2c-gpio) Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn> (for puf3) Acked-by: Barry Song <baohua.song@csr.com> (for sirf) Reviewed-by: Jean Delvare <khali@linux-fr.org> [wsa: Fixed "foo* bar" flaws while we are here] Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-powermac.c')
-rw-r--r--drivers/i2c/busses/i2c-powermac.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 5285f8565de4..0dd5b334d090 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -210,7 +210,7 @@ static const struct i2c_algorithm i2c_powermac_algorithm = {
210}; 210};
211 211
212 212
213static int __devexit i2c_powermac_remove(struct platform_device *dev) 213static int i2c_powermac_remove(struct platform_device *dev)
214{ 214{
215 struct i2c_adapter *adapter = platform_get_drvdata(dev); 215 struct i2c_adapter *adapter = platform_get_drvdata(dev);
216 int rc; 216 int rc;
@@ -227,7 +227,7 @@ static int __devexit i2c_powermac_remove(struct platform_device *dev)
227 return 0; 227 return 0;
228} 228}
229 229
230static u32 __devinit i2c_powermac_get_addr(struct i2c_adapter *adap, 230static u32 i2c_powermac_get_addr(struct i2c_adapter *adap,
231 struct pmac_i2c_bus *bus, 231 struct pmac_i2c_bus *bus,
232 struct device_node *node) 232 struct device_node *node)
233{ 233{
@@ -255,7 +255,7 @@ static u32 __devinit i2c_powermac_get_addr(struct i2c_adapter *adap,
255 return 0xffffffff; 255 return 0xffffffff;
256} 256}
257 257
258static void __devinit i2c_powermac_create_one(struct i2c_adapter *adap, 258static void i2c_powermac_create_one(struct i2c_adapter *adap,
259 const char *type, 259 const char *type,
260 u32 addr) 260 u32 addr)
261{ 261{
@@ -271,7 +271,7 @@ static void __devinit i2c_powermac_create_one(struct i2c_adapter *adap,
271 type); 271 type);
272} 272}
273 273
274static void __devinit i2c_powermac_add_missing(struct i2c_adapter *adap, 274static void i2c_powermac_add_missing(struct i2c_adapter *adap,
275 struct pmac_i2c_bus *bus, 275 struct pmac_i2c_bus *bus,
276 bool found_onyx) 276 bool found_onyx)
277{ 277{
@@ -297,7 +297,7 @@ static void __devinit i2c_powermac_add_missing(struct i2c_adapter *adap,
297 } 297 }
298} 298}
299 299
300static bool __devinit i2c_powermac_get_type(struct i2c_adapter *adap, 300static bool i2c_powermac_get_type(struct i2c_adapter *adap,
301 struct device_node *node, 301 struct device_node *node,
302 u32 addr, char *type, int type_size) 302 u32 addr, char *type, int type_size)
303{ 303{
@@ -336,7 +336,7 @@ static bool __devinit i2c_powermac_get_type(struct i2c_adapter *adap,
336 return false; 336 return false;
337} 337}
338 338
339static void __devinit i2c_powermac_register_devices(struct i2c_adapter *adap, 339static void i2c_powermac_register_devices(struct i2c_adapter *adap,
340 struct pmac_i2c_bus *bus) 340 struct pmac_i2c_bus *bus)
341{ 341{
342 struct i2c_client *newdev; 342 struct i2c_client *newdev;
@@ -403,7 +403,7 @@ static void __devinit i2c_powermac_register_devices(struct i2c_adapter *adap,
403 i2c_powermac_add_missing(adap, bus, found_onyx); 403 i2c_powermac_add_missing(adap, bus, found_onyx);
404} 404}
405 405
406static int __devinit i2c_powermac_probe(struct platform_device *dev) 406static int i2c_powermac_probe(struct platform_device *dev)
407{ 407{
408 struct pmac_i2c_bus *bus = dev->dev.platform_data; 408 struct pmac_i2c_bus *bus = dev->dev.platform_data;
409 struct device_node *parent = NULL; 409 struct device_node *parent = NULL;
@@ -467,7 +467,7 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)
467 467
468static struct platform_driver i2c_powermac_driver = { 468static struct platform_driver i2c_powermac_driver = {
469 .probe = i2c_powermac_probe, 469 .probe = i2c_powermac_probe,
470 .remove = __devexit_p(i2c_powermac_remove), 470 .remove = i2c_powermac_remove,
471 .driver = { 471 .driver = {
472 .name = "i2c-powermac", 472 .name = "i2c-powermac",
473 .bus = &platform_bus_type, 473 .bus = &platform_bus_type,