xen: remove driver_data direct access of struct device from more drivers
Subsystems (5)
PATCH 1/1 xen: remove driver_data direct access of struct device from more drivers
From: Greg Kroah-Hartman <[email protected]>
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.
--- drivers/input/xen-kbdfront.c | 8 ++++---- drivers/net/xen-netfront.c | 10 +++++----- drivers/video/xen-fbfront.c | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-)
drivers/input/xen-kbdfront.c +4 -4
@@ -114,7 +114,7 @@ static int __devinit xenkbd_probe(structxenbus_dev_fatal (dev, -ENOMEM ,"allocating info structure" );return -ENOMEM ; } - dev->dev.driver_data = info; +dev_set_drvdata (&dev->dev, info); info->xbdev = dev; info->irq =-1 ;snprintf (info->phys,sizeof (info->phys),"xenbus/%s" , dev->nodename);
@@ -186,7 +186,7 @@ static int __devinit xenkbd_probe(structstatic int xenkbd_resume (struct xenbus_device *dev) { -struct xenkbd_info *info = dev->dev.driver_data; +struct xenkbd_info *info =dev_get_drvdata (&dev->dev);xenkbd_disconnect_backend (info);memset (info->page,0 ,PAGE_SIZE );
@@ -195,7 +195,7 @@ static int xenkbd_resume(struct xenbus_dstatic int xenkbd_remove (struct xenbus_device *dev) { -struct xenkbd_info *info = dev->dev.driver_data; +struct xenkbd_info *info =dev_get_drvdata (&dev->dev);xenkbd_disconnect_backend (info);if (info->kbd)
@@ -266,7 +266,7 @@ static void xenkbd_disconnect_backend(ststatic void xenkbd_backend_changed (struct xenbus_device *dev,enum xenbus_state backend_state) { -struct xenkbd_info *info = dev->dev.driver_data; +struct xenkbd_info *info =dev_get_drvdata (&dev->dev);int ret, val;switch (backend_state) {
drivers/net/xen-netfront.c +5 -5
@@ -1212,7 +1212,7 @@ static int __devinit netfront_probe(stru } info =netdev_priv (netdev); - dev->dev.driver_data = info; +dev_set_drvdata (&dev->dev, info); err =register_netdev (info->netdev);if (err) {
@@ -1233,7 +1233,7 @@ static int __devinit netfront_probe(stru fail:free_netdev (netdev); - dev->dev.driver_data =NULL ; +dev_set_drvdata (&dev->dev,NULL );return err; }
@@ -1275,7 +1275,7 @@ static void xennet_disconnect_backend(st*/ static int netfront_resume (struct xenbus_device *dev) { -struct netfront_info *info = dev->dev.driver_data; +struct netfront_info *info =dev_get_drvdata (&dev->dev);dev_dbg (&dev->dev,"%s\n" , dev->nodename);
@@ -1600,7 +1600,7 @@ static int xennet_connect(struct net_devstatic void backend_changed (struct xenbus_device *dev,enum xenbus_state backend_state) { -struct netfront_info *np = dev->dev.driver_data; +struct netfront_info *np =dev_get_drvdata (&dev->dev);struct net_device *netdev = np->netdev;dev_dbg (&dev->dev,"%s\n" ,xenbus_strstate (backend_state));
@@ -1774,7 +1774,7 @@ static struct xenbus_device_id netfront_ static int __devexit xennet_remove(struct xenbus_device *dev) { -struct netfront_info *info = dev->dev.driver_data; +struct netfront_info *info =dev_get_drvdata (&dev->dev);dev_dbg (&dev->dev,"%s\n" , dev->nodename);
drivers/video/xen-fbfront.c +4 -4
@@ -384,7 +384,7 @@ static int __devinit xenfb_probe(struct fb_size =XENFB_DEFAULT_FB_LEN ; } - dev->dev.driver_data = info; +dev_set_drvdata (&dev->dev, info); info->xbdev = dev; info->irq =-1 ; info->x1 = info->y1 =INT_MAX ;
@@ -503,7 +503,7 @@ xenfb_make_preferred_console(void)static int xenfb_resume (struct xenbus_device *dev) { -struct xenfb_info *info = dev->dev.driver_data; +struct xenfb_info *info =dev_get_drvdata (&dev->dev);xenfb_disconnect_backend (info);xenfb_init_shared_page (info, info->fb_info);
@@ -512,7 +512,7 @@ static int xenfb_resume(struct xenbus_destatic int xenfb_remove (struct xenbus_device *dev) { -struct xenfb_info *info = dev->dev.driver_data; +struct xenfb_info *info =dev_get_drvdata (&dev->dev);xenfb_disconnect_backend (info);if (info->fb_info) {
@@ -621,7 +621,7 @@ static void xenfb_disconnect_backend(strstatic void xenfb_backend_changed (struct xenbus_device *dev,enum xenbus_state backend_state) { -struct xenfb_info *info = dev->dev.driver_data; +struct xenfb_info *info =dev_get_drvdata (&dev->dev);int val;switch (backend_state) {
Quoted 8 lines · * Greg Kroah-Hartman ([email protected]) wrote:
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the
driver_datapointer in struct device. Instead, the functionsdev_get_drvdata()anddev_set_drvdata()should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.
Quoted 5 lines
Cc Chris Wright <[email protected]>Cc Jeremy Fitzhardinge <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 9 lines · Chris Wright
Quoted 8 lines · * Greg Kroah-Hartman ([email protected]) wrote:
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the
driver_datapointer in struct device. Instead, the functionsdev_get_drvdata()anddev_set_drvdata()should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.
Quoted 7 lines
Quoted 5 lines
Cc Chris Wright <[email protected]>Cc Jeremy Fitzhardinge <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Acked-by Chris Wright <[email protected]>
thanks, I'll go add it.
greg k-h