From 5ab02b6033681746fd3b156b7b21b5806a1633c1 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu, 11 Feb 2010 16:07:31 -0800
Subject: [PATCH] --- yaml --- r: 251208 b: refs/heads/master c:
 5cf6e4f6f6d5549904db6ecb3ffd5b8f71f41250 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/xen/blkback/xenbus.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4724ffac8632..32d242d5a7bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7579a99b598f8e4a2b4df4854fbda2cc961bb02
+refs/heads/master: 5cf6e4f6f6d5549904db6ecb3ffd5b8f71f41250
diff --git a/trunk/drivers/xen/blkback/xenbus.c b/trunk/drivers/xen/blkback/xenbus.c
index 04c0a12aff36..34f8e4046578 100644
--- a/trunk/drivers/xen/blkback/xenbus.c
+++ b/trunk/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));