3 files changed, 11 insertions, 5 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 5d445f48789b..7c237e6ac711 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1265,8 +1265,14 @@ static struct device_type input_dev_type = {
         .uevent         = input_dev_uevent,
 };
 
+static char *input_nodename(struct device *dev)
+{
+        return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev));
+}
+
 struct class input_class = {
         .name           = "input",
+        .nodename       = input_nodename,
 };
 EXPORT_SYMBOL_GPL(input_class);
 
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index 69af8385ab14..2957d48e0045 100644
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -569,7 +569,7 @@ static int wm97xx_probe(struct device *dev)
         mutex_init(&wm->codec_mutex);
 
         wm->dev = dev;
-        dev->driver_data = wm;
+        dev_set_drvdata(dev, wm);
         wm->ac97 = to_ac97_t(dev);
 
         /* check that we have a supported codec */
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c
index 928d2ed8865f..b115726dc088 100644
--- a/drivers/input/xen-kbdfront.c
+++ b/drivers/input/xen-kbdfront.c
@@ -114,7 +114,7 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev,
                 xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");
                 return -ENOMEM;
         }
-        dev->dev.driver_data = info;
+        dev_set_drvdata(&dev->dev, info);
         info->xbdev = dev;
         info->irq = -1;
         snprintf(info->phys, sizeof(info->phys), "xenbus/%s", dev->nodename);
@@ -186,7 +186,7 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev,
 
 static int xenkbd_resume(struct xenbus_device *dev)
 {
-        struct xenkbd_info *info = dev->dev.driver_data;
+        struct xenkbd_info *info = dev_get_drvdata(&dev->dev);
 
         xenkbd_disconnect_backend(info);
         memset(info->page, 0, PAGE_SIZE);
@@ -195,7 +195,7 @@ static int xenkbd_resume(struct xenbus_device *dev)
 
 static int xenkbd_remove(struct xenbus_device *dev)
 {
-        struct xenkbd_info *info = dev->dev.driver_data;
+        struct xenkbd_info *info = dev_get_drvdata(&dev->dev);
 
         xenkbd_disconnect_backend(info);
         if (info->kbd)
@@ -266,7 +266,7 @@ static void xenkbd_disconnect_backend(struct xenkbd_info *info)
 static void xenkbd_backend_changed(struct xenbus_device *dev,
                                    enum xenbus_state backend_state)
 {
-        struct xenkbd_info *info = dev->dev.driver_data;
+        struct xenkbd_info *info = dev_get_drvdata(&dev->dev);
         int ret, val;
 
         switch (backend_state) {