1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index dbb9c48623df..6a2e150e75bb 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -101,15 +101,21 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus)
         return 0;
 }
 
-static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev,
-                                        const struct of_device_id *match)
+static struct of_device_id fs_enet_mdio_fec_match[];
+static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
 {
+        const struct of_device_id *match;
         struct resource res;
         struct mii_bus *new_bus;
         struct fec_info *fec;
-        int (*get_bus_freq)(struct device_node *) = match->data;
+        int (*get_bus_freq)(struct device_node *);
         int ret = -ENOMEM, clock, speed;
 
+        match = of_match_device(fs_enet_mdio_fec_match, &ofdev->dev);
+        if (!match)
+                return -EINVAL;
+        get_bus_freq = match->data;
+
         new_bus = mdiobus_alloc();
         if (!new_bus)
                 goto out;
@@ -221,7 +227,7 @@ static struct of_device_id fs_enet_mdio_fec_match[] = {
 };
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match);
 
-static struct of_platform_driver fs_enet_fec_mdio_driver = {
+static struct platform_driver fs_enet_fec_mdio_driver = {
         .driver = {
                 .name = "fsl-fec-mdio",
                 .owner = THIS_MODULE,
@@ -233,12 +239,12 @@ static struct of_platform_driver fs_enet_fec_mdio_driver = {
 
 static int fs_enet_mdio_fec_init(void)
 {
-        return of_register_platform_driver(&fs_enet_fec_mdio_driver);
+        return platform_driver_register(&fs_enet_fec_mdio_driver);
 }
 
 static void fs_enet_mdio_fec_exit(void)
 {
-        of_unregister_platform_driver(&fs_enet_fec_mdio_driver);
+        platform_driver_unregister(&fs_enet_fec_mdio_driver);
 }
 
 module_init(fs_enet_mdio_fec_init);