aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-elektor.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-elektor.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-elektor.c')
-rw-r--r--drivers/i2c/busses/i2c-elektor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 37e2e82a9c88..485497066ed7 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -205,7 +205,7 @@ static struct i2c_adapter pcf_isa_ops = {
205 .name = "i2c-elektor", 205 .name = "i2c-elektor",
206}; 206};
207 207
208static int __devinit elektor_match(struct device *dev, unsigned int id) 208static int elektor_match(struct device *dev, unsigned int id)
209{ 209{
210#ifdef __alpha__ 210#ifdef __alpha__
211 /* check to see we have memory mapped PCF8584 connected to the 211 /* check to see we have memory mapped PCF8584 connected to the
@@ -264,7 +264,7 @@ static int __devinit elektor_match(struct device *dev, unsigned int id)
264 return 1; 264 return 1;
265} 265}
266 266
267static int __devinit elektor_probe(struct device *dev, unsigned int id) 267static int elektor_probe(struct device *dev, unsigned int id)
268{ 268{
269 init_waitqueue_head(&pcf_wait); 269 init_waitqueue_head(&pcf_wait);
270 if (pcf_isa_init()) 270 if (pcf_isa_init())
@@ -293,7 +293,7 @@ static int __devinit elektor_probe(struct device *dev, unsigned int id)
293 return -ENODEV; 293 return -ENODEV;
294} 294}
295 295
296static int __devexit elektor_remove(struct device *dev, unsigned int id) 296static int elektor_remove(struct device *dev, unsigned int id)
297{ 297{
298 i2c_del_adapter(&pcf_isa_ops); 298 i2c_del_adapter(&pcf_isa_ops);
299 299
@@ -316,7 +316,7 @@ static int __devexit elektor_remove(struct device *dev, unsigned int id)
316static struct isa_driver i2c_elektor_driver = { 316static struct isa_driver i2c_elektor_driver = {
317 .match = elektor_match, 317 .match = elektor_match,
318 .probe = elektor_probe, 318 .probe = elektor_probe,
319 .remove = __devexit_p(elektor_remove), 319 .remove = elektor_remove,
320 .driver = { 320 .driver = {
321 .owner = THIS_MODULE, 321 .owner = THIS_MODULE,
322 .name = "i2c-elektor", 322 .name = "i2c-elektor",