sparc: remove references to of_device and to_of_device

[pandora-kernel.git] / arch / sparc / kernel / central.c

diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index d533f3d..cfa2624 100644 (file)
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -59,7 +59,7 @@ static int __devinit clock_board_calc_nslots(struct clock_board *p)
        }
 }
 
-static int __devinit clock_board_probe(struct of_device *op,
+static int __devinit clock_board_probe(struct platform_device *op,
                                       const struct of_device_id *match)
 {
        struct clock_board *p = kzalloc(sizeof(*p), GFP_KERNEL);
@@ -149,14 +149,15 @@ static struct of_device_id __initdata clock_board_match[] = {
 };
 
 static struct of_platform_driver clock_board_driver = {
-       .match_table    = clock_board_match,
        .probe          = clock_board_probe,
-       .driver         = {
-               .name   = "clock_board",
+       .driver = {
+               .name = "clock_board",
+               .owner = THIS_MODULE,
+               .of_match_table = clock_board_match,
        },
 };
 
-static int __devinit fhc_probe(struct of_device *op,
+static int __devinit fhc_probe(struct platform_device *op,
                               const struct of_device_id *match)
 {
        struct fhc *p = kzalloc(sizeof(*p), GFP_KERNEL);
@@ -254,17 +255,18 @@ static struct of_device_id __initdata fhc_match[] = {
 };
 
 static struct of_platform_driver fhc_driver = {
-       .match_table    = fhc_match,
        .probe          = fhc_probe,
-       .driver         = {
-               .name   = "fhc",
+       .driver = {
+               .name = "fhc",
+               .owner = THIS_MODULE,
+               .of_match_table = fhc_match,
        },
 };
 
 static int __init sunfire_init(void)
 {
-       (void) of_register_driver(&fhc_driver, &of_platform_bus_type);
-       (void) of_register_driver(&clock_board_driver, &of_platform_bus_type);
+       (void) of_register_platform_driver(&fhc_driver);
+       (void) of_register_platform_driver(&clock_board_driver);
        return 0;
 }