Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[deliverable/linux.git] / drivers / mfd / timberdale.c

diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c
index 0c1fcbc23d045652ba224a0871a05f1769d2114a..a6755ec7bd6ac55a1a8675a2d0382330f6863f54 100644 (file)
--- a/drivers/mfd/timberdale.c
+++ b/drivers/mfd/timberdale.c
@@ -115,11 +115,11 @@ static const struct resource timberdale_ocores_resources[] = {
        },
 };
 
-const struct max7301_platform_data timberdale_max7301_platform_data = {
+static const struct max7301_platform_data timberdale_max7301_platform_data = {
        .base = 200
 };
 
-const struct mc33880_platform_data timberdale_mc33880_platform_data = {
+static const struct mc33880_platform_data timberdale_mc33880_platform_data = {
        .base = 100
 };
 
@@ -781,7 +781,6 @@ static int timb_probe(struct pci_dev *dev,
                        priv->fw.major, priv->fw.minor, ip_setup);
                err = -ENODEV;
                goto err_mfd;
-               break;
        }
 
        if (err) {
@@ -869,34 +868,7 @@ static struct pci_driver timberdale_pci_driver = {
        .remove = timb_remove,
 };
 
-static int __init timberdale_init(void)
-{
-       int err;
-
-       err = pci_register_driver(&timberdale_pci_driver);
-       if (err < 0) {
-               printk(KERN_ERR
-                       "Failed to register PCI driver for %s device.\n",
-                       timberdale_pci_driver.name);
-               return -ENODEV;
-       }
-
-       printk(KERN_INFO "Driver for %s has been successfully registered.\n",
-               timberdale_pci_driver.name);
-
-       return 0;
-}
-
-static void __exit timberdale_exit(void)
-{
-       pci_unregister_driver(&timberdale_pci_driver);
-
-       printk(KERN_INFO "Driver for %s has been successfully unregistered.\n",
-               timberdale_pci_driver.name);
-}
-
-module_init(timberdale_init);
-module_exit(timberdale_exit);
+module_pci_driver(timberdale_pci_driver);
 
 MODULE_AUTHOR("Mocean Laboratories <info@mocean-labs.com>");
 MODULE_VERSION(DRV_VERSION);