diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:17:43 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:17:43 +0900 |
| commit | c681427e5ca22925fcc1be76a2e260a11e0a8498 (patch) | |
| tree | 5518d76ef0723177dfbb14546155f55532dcd96f /drivers/ide/cs5536.c | |
| parent | 1b2722752fe7bf21e76c87080add6d6c40af339f (diff) | |
| parent | c2f7d1e103ef1b5f3bd6a8a09aebf5eac7df4aca (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
"Just some minor cleanups and simplifications"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: pmac: remove unnecessary pci_set_drvdata()
ide: cs5536: use module_pci_driver()
ide: pmac: Remove casting the return value which is a void pointer
Diffstat (limited to 'drivers/ide/cs5536.c')
| -rw-r--r-- | drivers/ide/cs5536.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/ide/cs5536.c b/drivers/ide/cs5536.c index 24214ab60ac..de9185db41d 100644 --- a/drivers/ide/cs5536.c +++ b/drivers/ide/cs5536.c @@ -295,15 +295,7 @@ static struct pci_driver cs5536_pci_driver = { .resume = ide_pci_resume, }; -static int __init cs5536_init(void) -{ - return pci_register_driver(&cs5536_pci_driver); -} - -static void __exit cs5536_exit(void) -{ - pci_unregister_driver(&cs5536_pci_driver); -} +module_pci_driver(cs5536_pci_driver); MODULE_AUTHOR("Martin K. Petersen, Bartlomiej Zolnierkiewicz"); MODULE_DESCRIPTION("low-level driver for the CS5536 IDE controller"); @@ -312,6 +304,3 @@ MODULE_DEVICE_TABLE(pci, cs5536_pci_tbl); module_param_named(msr, use_msr, int, 0644); MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)"); - -module_init(cs5536_init); -module_exit(cs5536_exit); |