aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/electra_cf.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/electra_cf.c')
-rw-r--r--drivers/pcmcia/electra_cf.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 546d3024b6f0..6defd4a8168e 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -181,8 +181,7 @@ static struct pccard_operations electra_cf_ops = {
181 .set_mem_map = electra_cf_set_mem_map, 181 .set_mem_map = electra_cf_set_mem_map,
182}; 182};
183 183
184static int __devinit electra_cf_probe(struct platform_device *ofdev, 184static int __devinit electra_cf_probe(struct platform_device *ofdev)
185 const struct of_device_id *match)
186{ 185{
187 struct device *device = &ofdev->dev; 186 struct device *device = &ofdev->dev;
188 struct device_node *np = ofdev->dev.of_node; 187 struct device_node *np = ofdev->dev.of_node;
@@ -356,7 +355,7 @@ static const struct of_device_id electra_cf_match[] = {
356}; 355};
357MODULE_DEVICE_TABLE(of, electra_cf_match); 356MODULE_DEVICE_TABLE(of, electra_cf_match);
358 357
359static struct of_platform_driver electra_cf_driver = { 358static struct platform_driver electra_cf_driver = {
360 .driver = { 359 .driver = {
361 .name = (char *)driver_name, 360 .name = (char *)driver_name,
362 .owner = THIS_MODULE, 361 .owner = THIS_MODULE,
@@ -368,13 +367,13 @@ static struct of_platform_driver electra_cf_driver = {
368 367
369static int __init electra_cf_init(void) 368static int __init electra_cf_init(void)
370{ 369{
371 return of_register_platform_driver(&electra_cf_driver); 370 return platform_driver_register(&electra_cf_driver);
372} 371}
373module_init(electra_cf_init); 372module_init(electra_cf_init);
374 373
375static void __exit electra_cf_exit(void) 374static void __exit electra_cf_exit(void)
376{ 375{
377 of_unregister_platform_driver(&electra_cf_driver); 376 platform_driver_unregister(&electra_cf_driver);
378} 377}
379module_exit(electra_cf_exit); 378module_exit(electra_cf_exit);
380 379