xen/blkback: use drv_get/set_drvdata rather than directly accessing driver_data.

Direct driver_data access is obsolete and will disappear.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/drivers/xen/blkback/xenbus.c b/drivers/xen/blkback/xenbus.c
index 04c0a12aff366ee1bb4326e1a58ef6b1da66920e..34f8e4046578f8ddc0d725da8ba054f19c0b627c 100644 (file)
--- a/drivers/xen/blkback/xenbus.c
+++ b/drivers/xen/blkback/xenbus.c
@@ -105,7 +105,7 @@ static void update_blkif_status(blkif_t *blkif)
                                   char *buf)                           \
        {                                                               \
                struct xenbus_device *dev = to_xenbus_device(_dev);     \
-               struct backend_info *be = dev->dev.driver_data;         \
+               struct backend_info *be = dev_get_drvdata(&dev->dev);   \
                                                                        \
                return sprintf(buf, format, ##args);                    \
        }                                                               \
@@ -169,7 +169,7 @@ void xenvbd_sysfs_delif(struct xenbus_device *dev)
 
 static int blkback_remove(struct xenbus_device *dev)
 {
-       struct backend_info *be = dev->dev.driver_data;
+       struct backend_info *be = dev_get_drvdata(&dev->dev);
 
        DPRINTK("");
 
@@ -190,7 +190,7 @@ static int blkback_remove(struct xenbus_device *dev)
        }
 
        kfree(be);
-       dev->dev.driver_data = NULL;
+       dev_set_drvdata(&dev->dev, NULL);
        return 0;
 }
 
@@ -225,7 +225,7 @@ static int blkback_probe(struct xenbus_device *dev,
                return -ENOMEM;
        }
        be->dev = dev;
-       dev->dev.driver_data = be;
+       dev_set_drvdata(&dev->dev, be);
 
        be->blkif = blkif_alloc(dev->otherend_id);
        if (IS_ERR(be->blkif)) {
@@ -348,7 +348,7 @@ static void backend_changed(struct xenbus_watch *watch,
 static void frontend_changed(struct xenbus_device *dev,
                             enum xenbus_state frontend_state)
 {
-       struct backend_info *be = dev->dev.driver_data;
+       struct backend_info *be = dev_get_drvdata(&dev->dev);
        int err;
 
        DPRINTK("%s", xenbus_strstate(frontend_state));