|
@@ -1321,7 +1321,7 @@ static unsigned int sm501_mem_local[] = {
|
|
|
* Common init code for an SM501
|
|
|
*/
|
|
|
|
|
|
-static int sm501_init_dev(struct sm501_devdata *sm)
|
|
|
+static int __devinit sm501_init_dev(struct sm501_devdata *sm)
|
|
|
{
|
|
|
struct sm501_initdata *idata;
|
|
|
struct sm501_platdata *pdata;
|
|
@@ -1397,7 +1397,7 @@ static int sm501_init_dev(struct sm501_devdata *sm)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int sm501_plat_probe(struct platform_device *dev)
|
|
|
+static int __devinit sm501_plat_probe(struct platform_device *dev)
|
|
|
{
|
|
|
struct sm501_devdata *sm;
|
|
|
int ret;
|
|
@@ -1586,8 +1586,8 @@ static struct sm501_platdata sm501_pci_platdata = {
|
|
|
.gpio_base = -1,
|
|
|
};
|
|
|
|
|
|
-static int sm501_pci_probe(struct pci_dev *dev,
|
|
|
- const struct pci_device_id *id)
|
|
|
+static int __devinit sm501_pci_probe(struct pci_dev *dev,
|
|
|
+ const struct pci_device_id *id)
|
|
|
{
|
|
|
struct sm501_devdata *sm;
|
|
|
int err;
|
|
@@ -1693,7 +1693,7 @@ static void sm501_dev_remove(struct sm501_devdata *sm)
|
|
|
sm501_gpio_remove(sm);
|
|
|
}
|
|
|
|
|
|
-static void sm501_pci_remove(struct pci_dev *dev)
|
|
|
+static void __devexit sm501_pci_remove(struct pci_dev *dev)
|
|
|
{
|
|
|
struct sm501_devdata *sm = pci_get_drvdata(dev);
|
|
|
|
|
@@ -1727,16 +1727,16 @@ static struct pci_device_id sm501_pci_tbl[] = {
|
|
|
|
|
|
MODULE_DEVICE_TABLE(pci, sm501_pci_tbl);
|
|
|
|
|
|
-static struct pci_driver sm501_pci_drv = {
|
|
|
+static struct pci_driver sm501_pci_driver = {
|
|
|
.name = "sm501",
|
|
|
.id_table = sm501_pci_tbl,
|
|
|
.probe = sm501_pci_probe,
|
|
|
- .remove = sm501_pci_remove,
|
|
|
+ .remove = __devexit_p(sm501_pci_remove),
|
|
|
};
|
|
|
|
|
|
MODULE_ALIAS("platform:sm501");
|
|
|
|
|
|
-static struct platform_driver sm501_plat_drv = {
|
|
|
+static struct platform_driver sm501_plat_driver = {
|
|
|
.driver = {
|
|
|
.name = "sm501",
|
|
|
.owner = THIS_MODULE,
|
|
@@ -1749,14 +1749,14 @@ static struct platform_driver sm501_plat_drv = {
|
|
|
|
|
|
static int __init sm501_base_init(void)
|
|
|
{
|
|
|
- platform_driver_register(&sm501_plat_drv);
|
|
|
- return pci_register_driver(&sm501_pci_drv);
|
|
|
+ platform_driver_register(&sm501_plat_driver);
|
|
|
+ return pci_register_driver(&sm501_pci_driver);
|
|
|
}
|
|
|
|
|
|
static void __exit sm501_base_exit(void)
|
|
|
{
|
|
|
- platform_driver_unregister(&sm501_plat_drv);
|
|
|
- pci_unregister_driver(&sm501_pci_drv);
|
|
|
+ platform_driver_unregister(&sm501_plat_driver);
|
|
|
+ pci_unregister_driver(&sm501_pci_driver);
|
|
|
}
|
|
|
|
|
|
module_init(sm501_base_init);
|