dt/spi: Eliminate users of of_platform_{,un}register_driver

Get rid of users of of_platform_driver in drivers/spi.  The
of_platform_{,un}register_driver functions are going away, so the
users need to be converted to using the platform_bus_type directly.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/spi/spi_fsl_espi.c b/drivers/spi/spi_fsl_espi.c
index a99e2333b949..900e921ab80e 100644
--- a/drivers/spi/spi_fsl_espi.c
+++ b/drivers/spi/spi_fsl_espi.c
@@ -685,8 +685,7 @@ static int of_fsl_espi_get_chipselects(struct device *dev)
         return 0;
 }
 
-static int __devinit of_fsl_espi_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *ofid)
+static int __devinit of_fsl_espi_probe(struct platform_device *ofdev)
 {
         struct device *dev = &ofdev->dev;
         struct device_node *np = ofdev->dev.of_node;
@@ -695,7 +694,7 @@ static int __devinit of_fsl_espi_probe(struct platform_device *ofdev,
         struct resource irq;
         int ret = -ENOMEM;
 
-        ret = of_mpc8xxx_spi_probe(ofdev, ofid);
+        ret = of_mpc8xxx_spi_probe(ofdev);
         if (ret)
                 return ret;
 
@@ -736,7 +735,7 @@ static const struct of_device_id of_fsl_espi_match[] = {
 };
 MODULE_DEVICE_TABLE(of, of_fsl_espi_match);
 
-static struct of_platform_driver fsl_espi_driver = {
+static struct platform_driver fsl_espi_driver = {
         .driver = {
                 .name = "fsl_espi",
                 .owner = THIS_MODULE,
@@ -748,13 +747,13 @@ static struct of_platform_driver fsl_espi_driver = {
 
 static int __init fsl_espi_init(void)
 {
-        return of_register_platform_driver(&fsl_espi_driver);
+        return platform_driver_register(&fsl_espi_driver);
 }
 module_init(fsl_espi_init);
 
 static void __exit fsl_espi_exit(void)
 {
-        of_unregister_platform_driver(&fsl_espi_driver);
+        platform_driver_unregister(&fsl_espi_driver);
 }
 module_exit(fsl_espi_exit);