diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-04 15:40:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:30:28 -0400 |
commit | 1b713e00500c6f03317742981674e89a21629399 (patch) | |
tree | 28effcbb622d14f72b3d2059c6a7db6b0ec124a6 /drivers/video/xen-fbfront.c | |
parent | 839214aeaae1866d55e745c676206825f8ba7e99 (diff) |
xen: remove driver_data direct access of struct device from more drivers
In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device. Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used. These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.
Cc: xen-devel@lists.xensource.com
Cc: virtualization@lists.osdl.org
Acked-by: Chris Wright <chrisw@sous-sol.org>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/video/xen-fbfront.c')
-rw-r--r-- | drivers/video/xen-fbfront.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index 2493f05e9f61..15502d5e3641 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c | |||
@@ -384,7 +384,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
384 | fb_size = XENFB_DEFAULT_FB_LEN; | 384 | fb_size = XENFB_DEFAULT_FB_LEN; |
385 | } | 385 | } |
386 | 386 | ||
387 | dev->dev.driver_data = info; | 387 | dev_set_drvdata(&dev->dev, info); |
388 | info->xbdev = dev; | 388 | info->xbdev = dev; |
389 | info->irq = -1; | 389 | info->irq = -1; |
390 | info->x1 = info->y1 = INT_MAX; | 390 | info->x1 = info->y1 = INT_MAX; |
@@ -503,7 +503,7 @@ xenfb_make_preferred_console(void) | |||
503 | 503 | ||
504 | static int xenfb_resume(struct xenbus_device *dev) | 504 | static int xenfb_resume(struct xenbus_device *dev) |
505 | { | 505 | { |
506 | struct xenfb_info *info = dev->dev.driver_data; | 506 | struct xenfb_info *info = dev_get_drvdata(&dev->dev); |
507 | 507 | ||
508 | xenfb_disconnect_backend(info); | 508 | xenfb_disconnect_backend(info); |
509 | xenfb_init_shared_page(info, info->fb_info); | 509 | xenfb_init_shared_page(info, info->fb_info); |
@@ -512,7 +512,7 @@ static int xenfb_resume(struct xenbus_device *dev) | |||
512 | 512 | ||
513 | static int xenfb_remove(struct xenbus_device *dev) | 513 | static int xenfb_remove(struct xenbus_device *dev) |
514 | { | 514 | { |
515 | struct xenfb_info *info = dev->dev.driver_data; | 515 | struct xenfb_info *info = dev_get_drvdata(&dev->dev); |
516 | 516 | ||
517 | xenfb_disconnect_backend(info); | 517 | xenfb_disconnect_backend(info); |
518 | if (info->fb_info) { | 518 | if (info->fb_info) { |
@@ -621,7 +621,7 @@ static void xenfb_disconnect_backend(struct xenfb_info *info) | |||
621 | static void xenfb_backend_changed(struct xenbus_device *dev, | 621 | static void xenfb_backend_changed(struct xenbus_device *dev, |
622 | enum xenbus_state backend_state) | 622 | enum xenbus_state backend_state) |
623 | { | 623 | { |
624 | struct xenfb_info *info = dev->dev.driver_data; | 624 | struct xenfb_info *info = dev_get_drvdata(&dev->dev); |
625 | int val; | 625 | int val; |
626 | 626 | ||
627 | switch (backend_state) { | 627 | switch (backend_state) { |