Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Drivers: sbus: remove __dev* attributes.

CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+15 -15
+3 -3
drivers/sbus/char/bbc_i2c.c
··· 355 355 extern int bbc_envctrl_init(struct bbc_i2c_bus *bp); 356 356 extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp); 357 357 358 - static int __devinit bbc_i2c_probe(struct platform_device *op) 358 + static int bbc_i2c_probe(struct platform_device *op) 359 359 { 360 360 struct bbc_i2c_bus *bp; 361 361 int err, index = 0; ··· 379 379 return err; 380 380 } 381 381 382 - static int __devexit bbc_i2c_remove(struct platform_device *op) 382 + static int bbc_i2c_remove(struct platform_device *op) 383 383 { 384 384 struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev); 385 385 ··· 413 413 .of_match_table = bbc_i2c_match, 414 414 }, 415 415 .probe = bbc_i2c_probe, 416 - .remove = __devexit_p(bbc_i2c_remove), 416 + .remove = bbc_i2c_remove, 417 417 }; 418 418 419 419 module_platform_driver(bbc_i2c_driver);
+3 -3
drivers/sbus/char/display7seg.c
··· 171 171 .fops = &d7s_fops 172 172 }; 173 173 174 - static int __devinit d7s_probe(struct platform_device *op) 174 + static int d7s_probe(struct platform_device *op) 175 175 { 176 176 struct device_node *opts; 177 177 int err = -EINVAL; ··· 236 236 goto out; 237 237 } 238 238 239 - static int __devexit d7s_remove(struct platform_device *op) 239 + static int d7s_remove(struct platform_device *op) 240 240 { 241 241 struct d7s *p = dev_get_drvdata(&op->dev); 242 242 u8 regs = readb(p->regs); ··· 272 272 .of_match_table = d7s_match, 273 273 }, 274 274 .probe = d7s_probe, 275 - .remove = __devexit_p(d7s_remove), 275 + .remove = d7s_remove, 276 276 }; 277 277 278 278 module_platform_driver(d7s_driver);
+3 -3
drivers/sbus/char/envctrl.c
··· 1028 1028 return 0; 1029 1029 } 1030 1030 1031 - static int __devinit envctrl_probe(struct platform_device *op) 1031 + static int envctrl_probe(struct platform_device *op) 1032 1032 { 1033 1033 struct device_node *dp; 1034 1034 int index, err; ··· 1104 1104 return err; 1105 1105 } 1106 1106 1107 - static int __devexit envctrl_remove(struct platform_device *op) 1107 + static int envctrl_remove(struct platform_device *op) 1108 1108 { 1109 1109 int index; 1110 1110 ··· 1135 1135 .of_match_table = envctrl_match, 1136 1136 }, 1137 1137 .probe = envctrl_probe, 1138 - .remove = __devexit_p(envctrl_remove), 1138 + .remove = envctrl_remove, 1139 1139 }; 1140 1140 1141 1141 module_platform_driver(envctrl_driver);
+3 -3
drivers/sbus/char/flash.c
··· 159 159 160 160 static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; 161 161 162 - static int __devinit flash_probe(struct platform_device *op) 162 + static int flash_probe(struct platform_device *op) 163 163 { 164 164 struct device_node *dp = op->dev.of_node; 165 165 struct device_node *parent; ··· 190 190 return misc_register(&flash_dev); 191 191 } 192 192 193 - static int __devexit flash_remove(struct platform_device *op) 193 + static int flash_remove(struct platform_device *op) 194 194 { 195 195 misc_deregister(&flash_dev); 196 196 ··· 212 212 .of_match_table = flash_match, 213 213 }, 214 214 .probe = flash_probe, 215 - .remove = __devexit_p(flash_remove), 215 + .remove = flash_remove, 216 216 }; 217 217 218 218 module_platform_driver(flash_driver);
+3 -3
drivers/sbus/char/uctrl.c
··· 347 347 348 348 } 349 349 350 - static int __devinit uctrl_probe(struct platform_device *op) 350 + static int uctrl_probe(struct platform_device *op) 351 351 { 352 352 struct uctrl_driver *p; 353 353 int err = -ENOMEM; ··· 402 402 goto out; 403 403 } 404 404 405 - static int __devexit uctrl_remove(struct platform_device *op) 405 + static int uctrl_remove(struct platform_device *op) 406 406 { 407 407 struct uctrl_driver *p = dev_get_drvdata(&op->dev); 408 408 ··· 430 430 .of_match_table = uctrl_match, 431 431 }, 432 432 .probe = uctrl_probe, 433 - .remove = __devexit_p(uctrl_remove), 433 + .remove = uctrl_remove, 434 434 }; 435 435 436 436