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

mfd: fix sm501 section mismatches

drv => driver renaming is needed otherwise modpost will spit false positives
re pointing to __devinit function from regular data.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

authored by

Alexey Dobriyan and committed by
Samuel Ortiz
158abca5 8915e540

+12 -12
+12 -12
drivers/mfd/sm501.c
··· 1321 1321 * Common init code for an SM501 1322 1322 */ 1323 1323 1324 - static int sm501_init_dev(struct sm501_devdata *sm) 1324 + static int __devinit sm501_init_dev(struct sm501_devdata *sm) 1325 1325 { 1326 1326 struct sm501_initdata *idata; 1327 1327 struct sm501_platdata *pdata; ··· 1397 1397 return 0; 1398 1398 } 1399 1399 1400 - static int sm501_plat_probe(struct platform_device *dev) 1400 + static int __devinit sm501_plat_probe(struct platform_device *dev) 1401 1401 { 1402 1402 struct sm501_devdata *sm; 1403 1403 int ret; ··· 1586 1586 .gpio_base = -1, 1587 1587 }; 1588 1588 1589 - static int sm501_pci_probe(struct pci_dev *dev, 1590 - const struct pci_device_id *id) 1589 + static int __devinit sm501_pci_probe(struct pci_dev *dev, 1590 + const struct pci_device_id *id) 1591 1591 { 1592 1592 struct sm501_devdata *sm; 1593 1593 int err; ··· 1693 1693 sm501_gpio_remove(sm); 1694 1694 } 1695 1695 1696 - static void sm501_pci_remove(struct pci_dev *dev) 1696 + static void __devexit sm501_pci_remove(struct pci_dev *dev) 1697 1697 { 1698 1698 struct sm501_devdata *sm = pci_get_drvdata(dev); 1699 1699 ··· 1727 1727 1728 1728 MODULE_DEVICE_TABLE(pci, sm501_pci_tbl); 1729 1729 1730 - static struct pci_driver sm501_pci_drv = { 1730 + static struct pci_driver sm501_pci_driver = { 1731 1731 .name = "sm501", 1732 1732 .id_table = sm501_pci_tbl, 1733 1733 .probe = sm501_pci_probe, 1734 - .remove = sm501_pci_remove, 1734 + .remove = __devexit_p(sm501_pci_remove), 1735 1735 }; 1736 1736 1737 1737 MODULE_ALIAS("platform:sm501"); 1738 1738 1739 - static struct platform_driver sm501_plat_drv = { 1739 + static struct platform_driver sm501_plat_driver = { 1740 1740 .driver = { 1741 1741 .name = "sm501", 1742 1742 .owner = THIS_MODULE, ··· 1749 1749 1750 1750 static int __init sm501_base_init(void) 1751 1751 { 1752 - platform_driver_register(&sm501_plat_drv); 1753 - return pci_register_driver(&sm501_pci_drv); 1752 + platform_driver_register(&sm501_plat_driver); 1753 + return pci_register_driver(&sm501_pci_driver); 1754 1754 } 1755 1755 1756 1756 static void __exit sm501_base_exit(void) 1757 1757 { 1758 - platform_driver_unregister(&sm501_plat_drv); 1759 - pci_unregister_driver(&sm501_pci_drv); 1758 + platform_driver_unregister(&sm501_plat_driver); 1759 + pci_unregister_driver(&sm501_pci_driver); 1760 1760 } 1761 1761 1762 1762 module_init(sm501_base_init);