diff options
Diffstat (limited to 'drivers/input/xen-kbdfront.c')
-rw-r--r-- | drivers/input/xen-kbdfront.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, | |||
114 | xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); | 114 | xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); |
115 | return -ENOMEM; | 115 | return -ENOMEM; |
116 | } | 116 | } |
117 | dev->dev.driver_data = info; | 117 | dev_set_drvdata(&dev->dev, info); |
118 | info->xbdev = dev; | 118 | info->xbdev = dev; |
119 | info->irq = -1; | 119 | info->irq = -1; |
120 | snprintf(info->phys, sizeof(info->phys), "xenbus/%s", dev->nodename); | 120 | snprintf(info->phys, sizeof(info->phys), "xenbus/%s", dev->nodename); |
@@ -186,7 +186,7 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev, | |||
186 | 186 | ||
187 | static int xenkbd_resume(struct xenbus_device *dev) | 187 | static int xenkbd_resume(struct xenbus_device *dev) |
188 | { | 188 | { |
189 | struct xenkbd_info *info = dev->dev.driver_data; | 189 | struct xenkbd_info *info = dev_get_drvdata(&dev->dev); |
190 | 190 | ||
191 | xenkbd_disconnect_backend(info); | 191 | xenkbd_disconnect_backend(info); |
192 | memset(info->page, 0, PAGE_SIZE); | 192 | memset(info->page, 0, PAGE_SIZE); |
@@ -195,7 +195,7 @@ static int xenkbd_resume(struct xenbus_device *dev) | |||
195 | 195 | ||
196 | static int xenkbd_remove(struct xenbus_device *dev) | 196 | static int xenkbd_remove(struct xenbus_device *dev) |
197 | { | 197 | { |
198 | struct xenkbd_info *info = dev->dev.driver_data; | 198 | struct xenkbd_info *info = dev_get_drvdata(&dev->dev); |
199 | 199 | ||
200 | xenkbd_disconnect_backend(info); | 200 | xenkbd_disconnect_backend(info); |
201 | if (info->kbd) | 201 | if (info->kbd) |
@@ -266,7 +266,7 @@ static void xenkbd_disconnect_backend(struct xenkbd_info *info) | |||
266 | static void xenkbd_backend_changed(struct xenbus_device *dev, | 266 | static void xenkbd_backend_changed(struct xenbus_device *dev, |
267 | enum xenbus_state backend_state) | 267 | enum xenbus_state backend_state) |
268 | { | 268 | { |
269 | struct xenkbd_info *info = dev->dev.driver_data; | 269 | struct xenkbd_info *info = dev_get_drvdata(&dev->dev); |
270 | int ret, val; | 270 | int ret, val; |
271 | 271 | ||
272 | switch (backend_state) { | 272 | switch (backend_state) { |