projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
atm
/
fore200e.c
diff --git
a/drivers/atm/fore200e.c
b/drivers/atm/fore200e.c
index da8f176c051e19e164b0fdc362b3ba77d3e89738..b7385e0777176413c2497b780797e81189888632 100644
(file)
--- a/
drivers/atm/fore200e.c
+++ b/
drivers/atm/fore200e.c
@@
-2657,7
+2657,7
@@
static int __devinit fore200e_sba_probe(struct of_device *op,
fore200e->bus = bus;
fore200e->bus_dev = op;
fore200e->bus = bus;
fore200e->bus_dev = op;
- fore200e->irq = op->irqs[0];
+ fore200e->irq = op->
archdata.
irqs[0];
fore200e->phys_base = op->resource[0].start;
sprintf(fore200e->name, "%s-%d", bus->model_name, index);
fore200e->phys_base = op->resource[0].start;
sprintf(fore200e->name, "%s-%d", bus->model_name, index);
@@
-2795,7
+2795,7
@@
static int __init fore200e_module_init(void)
printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");
#ifdef CONFIG_SBUS
printk(FORE200E "FORE Systems 200E-series ATM driver - version " FORE200E_VERSION "\n");
#ifdef CONFIG_SBUS
- err = of_register_
driver(&fore200e_sba_driver, &of_bus_type
);
+ err = of_register_
platform_driver(&fore200e_sba_driver
);
if (err)
return err;
#endif
if (err)
return err;
#endif
@@
-2806,7
+2806,7
@@
static int __init fore200e_module_init(void)
#ifdef CONFIG_SBUS
if (err)
#ifdef CONFIG_SBUS
if (err)
- of_unregister_driver(&fore200e_sba_driver);
+ of_unregister_
platform_
driver(&fore200e_sba_driver);
#endif
return err;
#endif
return err;
@@
-2818,7
+2818,7
@@
static void __exit fore200e_module_cleanup(void)
pci_unregister_driver(&fore200e_pca_driver);
#endif
#ifdef CONFIG_SBUS
pci_unregister_driver(&fore200e_pca_driver);
#endif
#ifdef CONFIG_SBUS
- of_unregister_driver(&fore200e_sba_driver);
+ of_unregister_
platform_
driver(&fore200e_sba_driver);
#endif
}
#endif
}