summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-13 00:36:15 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-13 00:36:15 +0200
commit17528b31c5e2b2d40bb52954af88849303ebb915 (patch)
tree70ca684e33a6579d12d5a887c86bfd3f74894e14 /drivers/ide
parent9a9ca16e7a36a9daa93f6d2cf912170091d91ed6 (diff)
parent71150d226564686ef32d15d29edfd18346f6e929 (diff)
downloadlinux-17528b31c5e2b2d40bb52954af88849303ebb915.tar.bz2
Merge branch 'pnp'
* pnp: PNP: Avoid leaving unregistered device objects in lists PNP: Convert pnp_lock into a mutex PNP: tty/serial/8250/8250_fintek: Use module_pnp_driver to register driver PNP: platform/x86/apple-gmux: Use module_pnp_driver to register driver PNP: net/sb1000: Use module_pnp_driver to register driver PNP: media/rc: Use module_pnp_driver to register driver PNP: ide/ide-pnp: Use module_pnp_driver to register driver PNP: ata/pata_isapnp: Use module_pnp_driver to register driver PNP: tpm/tpm_infineon: Use module_pnp_driver to register driver PNP: Add helper macro for pnp_register_driver boilerplate PNP / ACPI: Use ACPI_COMPANION_SET() during initialization
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-pnp.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index e5f3db831373..f5f2b62471da 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -96,17 +96,5 @@ static struct pnp_driver idepnp_driver = {
.remove = idepnp_remove,
};
-static int __init pnpide_init(void)
-{
- return pnp_register_driver(&idepnp_driver);
-}
-
-static void __exit pnpide_exit(void)
-{
- pnp_unregister_driver(&idepnp_driver);
-}
-
-module_init(pnpide_init);
-module_exit(pnpide_exit);
-
+module_pnp_driver(idepnp_driver);
MODULE_LICENSE("GPL");