diff options
Diffstat (limited to 'arch/sparc/kernel/auxio_64.c')
| -rw-r--r-- | arch/sparc/kernel/auxio_64.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/sparc/kernel/auxio_64.c b/arch/sparc/kernel/auxio_64.c index 9f52db2d441..86e55778e4a 100644 --- a/arch/sparc/kernel/auxio_64.c +++ b/arch/sparc/kernel/auxio_64.c @@ -93,7 +93,7 @@ void auxio_set_lte(int on) } EXPORT_SYMBOL(auxio_set_lte); -static struct of_device_id __initdata auxio_match[] = { +static const struct of_device_id auxio_match[] = { { .name = "auxio", }, @@ -102,9 +102,9 @@ static struct of_device_id __initdata auxio_match[] = { MODULE_DEVICE_TABLE(of, auxio_match); -static int __devinit auxio_probe(struct of_device *dev, const struct of_device_id *match) +static int auxio_probe(struct platform_device *dev) { - struct device_node *dp = dev->node; + struct device_node *dp = dev->dev.of_node; unsigned long size; if (!strcmp(dp->parent->name, "ebus")) { @@ -131,17 +131,18 @@ static int __devinit auxio_probe(struct of_device *dev, const struct of_device_i return 0; } -static struct of_platform_driver auxio_driver = { - .match_table = auxio_match, +static struct platform_driver auxio_driver = { .probe = auxio_probe, - .driver = { - .name = "auxio", + .driver = { + .name = "auxio", + .owner = THIS_MODULE, + .of_match_table = auxio_match, }, }; static int __init auxio_init(void) { - return of_register_driver(&auxio_driver, &of_platform_bus_type); + return platform_driver_register(&auxio_driver); } /* Must be after subsys_initcall() so that busses are probed. Must |