dt/powerpc: Eliminate users of of_platform_{,un}register_driver
Get rid of old users of of_platform_driver in arch/powerpc. Most of_platform_driver users can be converted to use the platform_bus directly. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
@@ -200,8 +200,7 @@ static irqreturn_t mpc85xx_pci_isr(int irq, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit mpc85xx_pci_err_probe(struct platform_device *op,
|
||||
const struct of_device_id *match)
|
||||
static int __devinit mpc85xx_pci_err_probe(struct platform_device *op)
|
||||
{
|
||||
struct edac_pci_ctl_info *pci;
|
||||
struct mpc85xx_pci_pdata *pdata;
|
||||
@@ -338,7 +337,7 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mpc85xx_pci_err_of_match);
|
||||
|
||||
static struct of_platform_driver mpc85xx_pci_err_driver = {
|
||||
static struct platform_driver mpc85xx_pci_err_driver = {
|
||||
.probe = mpc85xx_pci_err_probe,
|
||||
.remove = __devexit_p(mpc85xx_pci_err_remove),
|
||||
.driver = {
|
||||
@@ -503,8 +502,7 @@ static irqreturn_t mpc85xx_l2_isr(int irq, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit mpc85xx_l2_err_probe(struct platform_device *op,
|
||||
const struct of_device_id *match)
|
||||
static int __devinit mpc85xx_l2_err_probe(struct platform_device *op)
|
||||
{
|
||||
struct edac_device_ctl_info *edac_dev;
|
||||
struct mpc85xx_l2_pdata *pdata;
|
||||
@@ -656,7 +654,7 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mpc85xx_l2_err_of_match);
|
||||
|
||||
static struct of_platform_driver mpc85xx_l2_err_driver = {
|
||||
static struct platform_driver mpc85xx_l2_err_driver = {
|
||||
.probe = mpc85xx_l2_err_probe,
|
||||
.remove = mpc85xx_l2_err_remove,
|
||||
.driver = {
|
||||
@@ -956,8 +954,7 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci)
|
||||
}
|
||||
}
|
||||
|
||||
static int __devinit mpc85xx_mc_err_probe(struct platform_device *op,
|
||||
const struct of_device_id *match)
|
||||
static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
|
||||
{
|
||||
struct mem_ctl_info *mci;
|
||||
struct mpc85xx_mc_pdata *pdata;
|
||||
@@ -1136,7 +1133,7 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, mpc85xx_mc_err_of_match);
|
||||
|
||||
static struct of_platform_driver mpc85xx_mc_err_driver = {
|
||||
static struct platform_driver mpc85xx_mc_err_driver = {
|
||||
.probe = mpc85xx_mc_err_probe,
|
||||
.remove = mpc85xx_mc_err_remove,
|
||||
.driver = {
|
||||
@@ -1171,16 +1168,16 @@ static int __init mpc85xx_mc_init(void)
|
||||
break;
|
||||
}
|
||||
|
||||
res = of_register_platform_driver(&mpc85xx_mc_err_driver);
|
||||
res = platform_driver_register(&mpc85xx_mc_err_driver);
|
||||
if (res)
|
||||
printk(KERN_WARNING EDAC_MOD_STR "MC fails to register\n");
|
||||
|
||||
res = of_register_platform_driver(&mpc85xx_l2_err_driver);
|
||||
res = platform_driver_register(&mpc85xx_l2_err_driver);
|
||||
if (res)
|
||||
printk(KERN_WARNING EDAC_MOD_STR "L2 fails to register\n");
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
res = of_register_platform_driver(&mpc85xx_pci_err_driver);
|
||||
res = platform_driver_register(&mpc85xx_pci_err_driver);
|
||||
if (res)
|
||||
printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n");
|
||||
#endif
|
||||
@@ -1212,10 +1209,10 @@ static void __exit mpc85xx_mc_exit(void)
|
||||
on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
|
||||
#endif
|
||||
#ifdef CONFIG_PCI
|
||||
of_unregister_platform_driver(&mpc85xx_pci_err_driver);
|
||||
platform_driver_unregister(&mpc85xx_pci_err_driver);
|
||||
#endif
|
||||
of_unregister_platform_driver(&mpc85xx_l2_err_driver);
|
||||
of_unregister_platform_driver(&mpc85xx_mc_err_driver);
|
||||
platform_driver_unregister(&mpc85xx_l2_err_driver);
|
||||
platform_driver_unregister(&mpc85xx_mc_err_driver);
|
||||
}
|
||||
|
||||
module_exit(mpc85xx_mc_exit);
|
||||
|
Reference in New Issue
Block a user