intel_scu_ipc: Switch to use module_pci_driver() macro
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 12 Oct 2015 11:19:47 +0000 (14:19 +0300)
committerDarren Hart <dvhart@linux.intel.com>
Thu, 15 Oct 2015 15:23:12 +0000 (08:23 -0700)
Eliminate some boilerplate code by using module_pci_driver() instead of
init/exit, moving the salient bits from init into probe.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
drivers/platform/x86/intel_scu_ipc.c

index 5087485a1fa75812c6f6f8a87dbf44aff086ecfe..9de2029aa909fff71bb3301c7d95c386bb5ed2b3 100644 (file)
@@ -567,10 +567,15 @@ static irqreturn_t ioc(int irq, void *dev_id)
  */
 static int ipc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
+       int platform;           /* Platform type */
        int err;
        struct intel_scu_ipc_dev *scu = &ipcdev;
        struct intel_scu_ipc_pdata_t *pdata;
 
+       platform = intel_mid_identify_cpu();
+       if (platform == 0)
+               return -ENODEV;
+
        if (scu->dev)           /* We support only one SCU */
                return -EBUSY;
 
@@ -651,24 +656,8 @@ static struct pci_driver ipc_driver = {
        .remove = ipc_remove,
 };
 
-static int __init intel_scu_ipc_init(void)
-{
-       int platform;           /* Platform type */
-
-       platform = intel_mid_identify_cpu();
-       if (platform == 0)
-               return -ENODEV;
-       return  pci_register_driver(&ipc_driver);
-}
-
-static void __exit intel_scu_ipc_exit(void)
-{
-       pci_unregister_driver(&ipc_driver);
-}
+module_pci_driver(ipc_driver);
 
 MODULE_AUTHOR("Sreedhara DS <sreedhara.ds@intel.com>");
 MODULE_DESCRIPTION("Intel SCU IPC driver");
 MODULE_LICENSE("GPL");
-
-module_init(intel_scu_ipc_init);
-module_exit(intel_scu_ipc_exit);