diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-10-12 13:19:47 +0200 |
|---|---|---|
| committer | Darren Hart <dvhart@linux.intel.com> | 2015-10-15 17:23:12 +0200 |
| commit | 51c58f2b4f24214950d3dc6ab31af7c2532b096f (patch) | |
| tree | c7562e768e03b0f0bdd8daed0ab6a2b1313ff9ae | |
| parent | intel_scu_ipc: Convert to use struct device * (diff) | |
| download | linux-51c58f2b4f24214950d3dc6ab31af7c2532b096f.tar.xz linux-51c58f2b4f24214950d3dc6ab31af7c2532b096f.zip | |
intel_scu_ipc: Switch to use module_pci_driver() macro
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>
| -rw-r--r-- | drivers/platform/x86/intel_scu_ipc.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c index 5087485a1fa7..9de2029aa909 100644 --- a/drivers/platform/x86/intel_scu_ipc.c +++ b/drivers/platform/x86/intel_scu_ipc.c @@ -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); |