diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 03:15:41 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 03:15:41 +0200 |
commit | 4ece92df296f472e49d26ee38ddbed4596458132 (patch) | |
tree | 0b2960114194d20769273dadb0bf2897c8e0206a /drivers/ide/delkin_cb.c | |
parent | Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | ide: Fix IDE PIO size calculation (diff) | |
download | linux-4ece92df296f472e49d26ee38ddbed4596458132.tar.xz linux-4ece92df296f472e49d26ee38ddbed4596458132.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
"Just a few small things:
1) module_platform_driver_probe() conversions from Jingoo Han.
2) module_pci_driver() conversion from Libo Chen.
3) PIO size calculation fix from Steven J Hill"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: Fix IDE PIO size calculation
drivers/ide/delkin_cb: Convert to module_pci_driver
ide: gayle: use module_platform_driver_probe()
ide: tx4939ide: use module_platform_driver_probe()
ide: tx4938ide: use module_platform_driver_probe()
Diffstat (limited to 'drivers/ide/delkin_cb.c')
-rw-r--r-- | drivers/ide/delkin_cb.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/ide/delkin_cb.c b/drivers/ide/delkin_cb.c index 7e27d3295e55..300daabaa575 100644 --- a/drivers/ide/delkin_cb.c +++ b/drivers/ide/delkin_cb.c @@ -173,18 +173,7 @@ static struct pci_driver delkin_cb_pci_driver = { .resume = delkin_cb_resume, }; -static int __init delkin_cb_init(void) -{ - return pci_register_driver(&delkin_cb_pci_driver); -} - -static void __exit delkin_cb_exit(void) -{ - pci_unregister_driver(&delkin_cb_pci_driver); -} - -module_init(delkin_cb_init); -module_exit(delkin_cb_exit); +module_pci_driver(delkin_cb_pci_driver); MODULE_AUTHOR("Mark Lord"); MODULE_DESCRIPTION("Basic support for Delkin/ASKA/Workbit Cardbus IDE"); |