diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-04-02 21:59:44 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-05-13 23:47:19 -0400 |
| commit | 4d16cd658700a36af8788a09b4789d09da355a8c (patch) | |
| tree | 2674d8ff91911be1b278fcadce616254e6bedf56 /drivers/mtd/nand | |
| parent | 4aa6ae3ecca04d7956817170418c74861ce071de (diff) | |
mtd: use module_pci_driver
This patch converts the drivers in drivers/mtd/* to use module_pci_driver()
macro which makes the code smaller and a bit simpler.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/cafe_nand.c | 12 | ||||
| -rw-r--r-- | drivers/mtd/nand/denali.c | 15 | ||||
| -rw-r--r-- | drivers/mtd/nand/r852.c | 13 |
3 files changed, 3 insertions, 37 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 2a96e1a12062..2973d97bd529 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c | |||
| @@ -888,17 +888,7 @@ static struct pci_driver cafe_nand_pci_driver = { | |||
| 888 | .resume = cafe_nand_resume, | 888 | .resume = cafe_nand_resume, |
| 889 | }; | 889 | }; |
| 890 | 890 | ||
| 891 | static int __init cafe_nand_init(void) | 891 | module_pci_driver(cafe_nand_pci_driver); |
| 892 | { | ||
| 893 | return pci_register_driver(&cafe_nand_pci_driver); | ||
| 894 | } | ||
| 895 | |||
| 896 | static void __exit cafe_nand_exit(void) | ||
| 897 | { | ||
| 898 | pci_unregister_driver(&cafe_nand_pci_driver); | ||
| 899 | } | ||
| 900 | module_init(cafe_nand_init); | ||
| 901 | module_exit(cafe_nand_exit); | ||
| 902 | 892 | ||
| 903 | MODULE_LICENSE("GPL"); | 893 | MODULE_LICENSE("GPL"); |
| 904 | MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>"); | 894 | MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>"); |
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index a9e57d686297..a1048c7c5d2c 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c | |||
| @@ -1702,17 +1702,4 @@ static struct pci_driver denali_pci_driver = { | |||
| 1702 | .remove = denali_pci_remove, | 1702 | .remove = denali_pci_remove, |
| 1703 | }; | 1703 | }; |
| 1704 | 1704 | ||
| 1705 | static int __devinit denali_init(void) | 1705 | module_pci_driver(denali_pci_driver); |
| 1706 | { | ||
| 1707 | printk(KERN_INFO "Spectra MTD driver\n"); | ||
| 1708 | return pci_register_driver(&denali_pci_driver); | ||
| 1709 | } | ||
| 1710 | |||
| 1711 | /* Free memory */ | ||
| 1712 | static void __devexit denali_exit(void) | ||
| 1713 | { | ||
| 1714 | pci_unregister_driver(&denali_pci_driver); | ||
| 1715 | } | ||
| 1716 | |||
| 1717 | module_init(denali_init); | ||
| 1718 | module_exit(denali_exit); | ||
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c index c2040187c813..859ef318e5dc 100644 --- a/drivers/mtd/nand/r852.c +++ b/drivers/mtd/nand/r852.c | |||
| @@ -1104,18 +1104,7 @@ static struct pci_driver r852_pci_driver = { | |||
| 1104 | .driver.pm = &r852_pm_ops, | 1104 | .driver.pm = &r852_pm_ops, |
| 1105 | }; | 1105 | }; |
| 1106 | 1106 | ||
| 1107 | static __init int r852_module_init(void) | 1107 | module_pci_driver(r852_pci_driver); |
| 1108 | { | ||
| 1109 | return pci_register_driver(&r852_pci_driver); | ||
| 1110 | } | ||
| 1111 | |||
| 1112 | static void __exit r852_module_exit(void) | ||
| 1113 | { | ||
| 1114 | pci_unregister_driver(&r852_pci_driver); | ||
| 1115 | } | ||
| 1116 | |||
| 1117 | module_init(r852_module_init); | ||
| 1118 | module_exit(r852_module_exit); | ||
| 1119 | 1108 | ||
| 1120 | MODULE_LICENSE("GPL"); | 1109 | MODULE_LICENSE("GPL"); |
| 1121 | MODULE_AUTHOR("Maxim Levitsky <maximlevitsky@gmail.com>"); | 1110 | MODULE_AUTHOR("Maxim Levitsky <maximlevitsky@gmail.com>"); |
