2 files changed, 21 insertions, 35 deletions

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index fe865d9a3721..84c73a300acb 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -243,34 +243,18 @@ static int uml_net_change_mtu(struct net_device *dev, int new_mtu)
         return err;
 }
 
-static int uml_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        static const struct ethtool_drvinfo info = {
-                .cmd     = ETHTOOL_GDRVINFO,
-                .driver  = DRIVER_NAME,
-                .version = "42",
-        };
-        void *useraddr;
-        u32 ethcmd;
-
-        switch (cmd) {
-        case SIOCETHTOOL:
-                useraddr = ifr->ifr_data;
-                if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
-                        return -EFAULT;
-                switch (ethcmd) {
-                case ETHTOOL_GDRVINFO:
-                        if (copy_to_user(useraddr, &info, sizeof(info)))
-                                return -EFAULT;
-                        return 0;
-                default:
-                        return -EOPNOTSUPP;
-                }
-        default:
-                return -EINVAL;
-        }
+static void uml_net_get_drvinfo(struct net_device *dev,
+                                struct ethtool_drvinfo *info)
+{
+        strcpy(info->driver, DRIVER_NAME);
+        strcpy(info->version, "42");
 }
 
+static struct ethtool_ops uml_net_ethtool_ops = {
+        .get_drvinfo    = uml_net_get_drvinfo,
+        .get_link       = ethtool_op_get_link,
+};
+
 void uml_net_user_timer_expire(unsigned long _conn)
 {
 #ifdef undef
@@ -284,9 +268,10 @@ void uml_net_user_timer_expire(unsigned long _conn)
 static DEFINE_SPINLOCK(devices_lock);
 static struct list_head devices = LIST_HEAD_INIT(devices);
 
-static struct device_driver uml_net_driver = {
-        .name  = DRIVER_NAME,
-        .bus   = &platform_bus_type,
+static struct platform_driver uml_net_driver = {
+        .driver = {
+                .name  = DRIVER_NAME,
+        },
 };
 static int driver_registered;
 
@@ -333,7 +318,7 @@ static int eth_configure(int n, void *init, char *mac,
 
         /* sysfs register */
         if (!driver_registered) {
-                driver_register(&uml_net_driver);
+                platform_driver_register(&uml_net_driver);
                 driver_registered = 1;
         }
         device->pdev.id = n;
@@ -359,7 +344,7 @@ static int eth_configure(int n, void *init, char *mac,
         dev->tx_timeout = uml_net_tx_timeout;
         dev->set_mac_address = uml_net_set_mac;
         dev->change_mtu = uml_net_change_mtu;
-        dev->do_ioctl = uml_net_ioctl;
+        dev->ethtool_ops = &uml_net_ethtool_ops;
         dev->watchdog_timeo = (HZ >> 1);
         dev->irq = UM_ETH_IRQ;
 
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index b2c86257b0f8..93898917cbe5 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -823,9 +823,10 @@ static int ubd_mc_init(void)
 
 __initcall(ubd_mc_init);
 
-static struct device_driver ubd_driver = {
-        .name  = DRIVER_NAME,
-        .bus   = &platform_bus_type,
+static struct platform_driver ubd_driver = {
+        .driver = {
+                .name  = DRIVER_NAME,
+        },
 };
 
 int ubd_init(void)
@@ -850,7 +851,7 @@ int ubd_init(void)
                 if (register_blkdev(fake_major, "ubd"))
                         return -1;
         }
-        driver_register(&ubd_driver);
+        platform_driver_register(&ubd_driver);
         for (i = 0; i < MAX_DEV; i++) 
                 ubd_add(i);
         return 0;