summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorLibo Chen <clbchenlibo.chen@huawei.com>2013-07-03 15:09:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:08:06 -0700
commit5af1a9ce3d114bbd49b5a06bfc5f5404d73709e3 (patch)
tree4c90b873273d798ad90de8f4db7f649c364fd80c /drivers/memstick
parent10560490d9555b3add7e9b241594dddd07b160ec (diff)
downloadlinux-5af1a9ce3d114bbd49b5a06bfc5f5404d73709e3.tar.gz
linux-5af1a9ce3d114bbd49b5a06bfc5f5404d73709e3.tar.bz2
linux-5af1a9ce3d114bbd49b5a06bfc5f5404d73709e3.zip
drivers/memstick/host/r592.c: convert to module_pci_driver
Signed-off-by: Libo Chen <libo.chen@huawei.com> Cc: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/host/r592.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 9718661c1fb6..1b6e91345222 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -884,18 +884,7 @@ static struct pci_driver r852_pci_driver = {
.driver.pm = &r592_pm_ops,
};
-static __init int r592_module_init(void)
-{
- return pci_register_driver(&r852_pci_driver);
-}
-
-static void __exit r592_module_exit(void)
-{
- pci_unregister_driver(&r852_pci_driver);
-}
-
-module_init(r592_module_init);
-module_exit(r592_module_exit);
+module_pci_driver(r852_pci_driver);
module_param_named(enable_dma, r592_enable_dma, bool, S_IRUGO);
MODULE_PARM_DESC(enable_dma, "Enable usage of the DMA (default)");