summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorLibo Chen2013-07-04 00:09:13 +0200
committerLinus Torvalds2013-07-04 01:08:06 +0200
commit10560490d9555b3add7e9b241594dddd07b160ec (patch)
treed3820d93c85ad9d9d6d80baea1ec712da8279555 /drivers/memstick
parentpps-gpio: add device-tree binding and support (diff)
downloadkernel-qcow2-linux-10560490d9555b3add7e9b241594dddd07b160ec.tar.gz
kernel-qcow2-linux-10560490d9555b3add7e9b241594dddd07b160ec.tar.xz
kernel-qcow2-linux-10560490d9555b3add7e9b241594dddd07b160ec.zip
drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
Use module_pci_driver instead of init/exit, make code clean. Signed-off-by: Libo Chen <libo.chen@huawei.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/jmb38x_ms.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index c37d3756d8d2..aeabaa5aedf7 100644
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -1046,20 +1046,9 @@ static struct pci_driver jmb38x_ms_driver = {
.resume = jmb38x_ms_resume
};
-static int __init jmb38x_ms_init(void)
-{
- return pci_register_driver(&jmb38x_ms_driver);
-}
-
-static void __exit jmb38x_ms_exit(void)
-{
- pci_unregister_driver(&jmb38x_ms_driver);
-}
+module_pci_driver(jmb38x_ms_driver);
MODULE_AUTHOR("Alex Dubov");
MODULE_DESCRIPTION("JMicron jmb38x MemoryStick driver");
MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, jmb38x_ms_id_tbl);
-
-module_init(jmb38x_ms_init);
-module_exit(jmb38x_ms_exit);