diff options
author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-02-11 19:07:31 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-04-14 18:26:09 -0400 |
commit | 5cf6e4f6f6d5549904db6ecb3ffd5b8f71f41250 (patch) | |
tree | e60073a72893d6c2e347201b1a313b17d9062017 /drivers/xen/blkback/xenbus.c | |
parent | e7579a99b598f8e4a2b4df4854fbda2cc961bb02 (diff) |
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>
Diffstat (limited to 'drivers/xen/blkback/xenbus.c')
-rw-r--r-- | drivers/xen/blkback/xenbus.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/xen/blkback/xenbus.c b/drivers/xen/blkback/xenbus.c index 04c0a12aff36..34f8e4046578 100644 --- a/drivers/xen/blkback/xenbus.c +++ b/drivers/xen/blkback/xenbus.c | |||
@@ -105,7 +105,7 @@ static void update_blkif_status(blkif_t *blkif) | |||
105 | char *buf) \ | 105 | char *buf) \ |
106 | { \ | 106 | { \ |
107 | struct xenbus_device *dev = to_xenbus_device(_dev); \ | 107 | struct xenbus_device *dev = to_xenbus_device(_dev); \ |
108 | struct backend_info *be = dev->dev.driver_data; \ | 108 | struct backend_info *be = dev_get_drvdata(&dev->dev); \ |
109 | \ | 109 | \ |
110 | return sprintf(buf, format, ##args); \ | 110 | return sprintf(buf, format, ##args); \ |
111 | } \ | 111 | } \ |
@@ -169,7 +169,7 @@ void xenvbd_sysfs_delif(struct xenbus_device *dev) | |||
169 | 169 | ||
170 | static int blkback_remove(struct xenbus_device *dev) | 170 | static int blkback_remove(struct xenbus_device *dev) |
171 | { | 171 | { |
172 | struct backend_info *be = dev->dev.driver_data; | 172 | struct backend_info *be = dev_get_drvdata(&dev->dev); |
173 | 173 | ||
174 | DPRINTK(""); | 174 | DPRINTK(""); |
175 | 175 | ||
@@ -190,7 +190,7 @@ static int blkback_remove(struct xenbus_device *dev) | |||
190 | } | 190 | } |
191 | 191 | ||
192 | kfree(be); | 192 | kfree(be); |
193 | dev->dev.driver_data = NULL; | 193 | dev_set_drvdata(&dev->dev, NULL); |
194 | return 0; | 194 | return 0; |
195 | } | 195 | } |
196 | 196 | ||
@@ -225,7 +225,7 @@ static int blkback_probe(struct xenbus_device *dev, | |||
225 | return -ENOMEM; | 225 | return -ENOMEM; |
226 | } | 226 | } |
227 | be->dev = dev; | 227 | be->dev = dev; |
228 | dev->dev.driver_data = be; | 228 | dev_set_drvdata(&dev->dev, be); |
229 | 229 | ||
230 | be->blkif = blkif_alloc(dev->otherend_id); | 230 | be->blkif = blkif_alloc(dev->otherend_id); |
231 | if (IS_ERR(be->blkif)) { | 231 | if (IS_ERR(be->blkif)) { |
@@ -348,7 +348,7 @@ static void backend_changed(struct xenbus_watch *watch, | |||
348 | static void frontend_changed(struct xenbus_device *dev, | 348 | static void frontend_changed(struct xenbus_device *dev, |
349 | enum xenbus_state frontend_state) | 349 | enum xenbus_state frontend_state) |
350 | { | 350 | { |
351 | struct backend_info *be = dev->dev.driver_data; | 351 | struct backend_info *be = dev_get_drvdata(&dev->dev); |
352 | int err; | 352 | int err; |
353 | 353 | ||
354 | DPRINTK("%s", xenbus_strstate(frontend_state)); | 354 | DPRINTK("%s", xenbus_strstate(frontend_state)); |