diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-17 04:43:24 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 15:22:46 -0500 |
commit | 1c48a5c93da63132b92c4bbcd18e690c51539df6 (patch) | |
tree | 746e990ce0f49e48e2cc9d55766485f468ca35f6 /drivers/pcmcia/m8xx_pcmcia.c | |
parent | 793218dfea146946a076f4fe51e574db61034a3e (diff) |
dt: Eliminate of_platform_{,un}register_driver
Final step to eliminate of_platform_bus_type. They're all just
platform drivers now.
v2: fix type in pasemi_nand.c (thanks to Stephen Rothwell)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/pcmcia/m8xx_pcmcia.c')
-rw-r--r-- | drivers/pcmcia/m8xx_pcmcia.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 0db482771fb5..271a590a5f3c 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
@@ -1148,8 +1148,7 @@ static struct pccard_operations m8xx_services = { | |||
1148 | .set_mem_map = m8xx_set_mem_map, | 1148 | .set_mem_map = m8xx_set_mem_map, |
1149 | }; | 1149 | }; |
1150 | 1150 | ||
1151 | static int __init m8xx_probe(struct platform_device *ofdev, | 1151 | static int __init m8xx_probe(struct platform_device *ofdev) |
1152 | const struct of_device_id *match) | ||
1153 | { | 1152 | { |
1154 | struct pcmcia_win *w; | 1153 | struct pcmcia_win *w; |
1155 | unsigned int i, m, hwirq; | 1154 | unsigned int i, m, hwirq; |
@@ -1295,7 +1294,7 @@ static const struct of_device_id m8xx_pcmcia_match[] = { | |||
1295 | 1294 | ||
1296 | MODULE_DEVICE_TABLE(of, m8xx_pcmcia_match); | 1295 | MODULE_DEVICE_TABLE(of, m8xx_pcmcia_match); |
1297 | 1296 | ||
1298 | static struct of_platform_driver m8xx_pcmcia_driver = { | 1297 | static struct platform_driver m8xx_pcmcia_driver = { |
1299 | .driver = { | 1298 | .driver = { |
1300 | .name = driver_name, | 1299 | .name = driver_name, |
1301 | .owner = THIS_MODULE, | 1300 | .owner = THIS_MODULE, |
@@ -1307,12 +1306,12 @@ static struct of_platform_driver m8xx_pcmcia_driver = { | |||
1307 | 1306 | ||
1308 | static int __init m8xx_init(void) | 1307 | static int __init m8xx_init(void) |
1309 | { | 1308 | { |
1310 | return of_register_platform_driver(&m8xx_pcmcia_driver); | 1309 | return platform_driver_register(&m8xx_pcmcia_driver); |
1311 | } | 1310 | } |
1312 | 1311 | ||
1313 | static void __exit m8xx_exit(void) | 1312 | static void __exit m8xx_exit(void) |
1314 | { | 1313 | { |
1315 | of_unregister_platform_driver(&m8xx_pcmcia_driver); | 1314 | platform_driver_unregister(&m8xx_pcmcia_driver); |
1316 | } | 1315 | } |
1317 | 1316 | ||
1318 | module_init(m8xx_init); | 1317 | module_init(m8xx_init); |