Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b713e00 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarChris Wright <chrisw@sous-sol.org>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 839214ae

drivers/input/xen-kbdfront.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev, 
		xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");

		xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure");

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	dev->dev.driver_data = info;

	dev_set_drvdata(&dev->dev, info);

	info->xbdev = dev;

	info->xbdev = dev;

	info->irq = -1;

	info->irq = -1;

	snprintf(info->phys, sizeof(info->phys), "xenbus/%s", dev->nodename);

	snprintf(info->phys, sizeof(info->phys), "xenbus/%s", dev->nodename);
@@ -186,7 +186,7 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev, 




static int xenkbd_resume(struct xenbus_device *dev)

static 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);

	xenkbd_disconnect_backend(info);

	memset(info->page, 0, PAGE_SIZE);

	memset(info->page, 0, PAGE_SIZE);
@@ -195,7 +195,7 @@ static int xenkbd_resume(struct xenbus_device *dev) 




static int xenkbd_remove(struct xenbus_device *dev)

static 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);

	xenkbd_disconnect_backend(info);

	if (info->kbd)

	if (info->kbd)
@@ -266,7 +266,7 @@ static void xenkbd_disconnect_backend(struct xenkbd_info *info) 
static void xenkbd_backend_changed(struct xenbus_device *dev,

static void xenkbd_backend_changed(struct xenbus_device *dev,

				   enum xenbus_state backend_state)

				   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;

	int ret, val;





	switch (backend_state) {

	switch (backend_state) {

drivers/net/xen-netfront.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1212,7 +1212,7 @@ static int __devinit netfront_probe(struct xenbus_device *dev, 
	}

	}





	info = netdev_priv(netdev);

	info = netdev_priv(netdev);

	dev->dev.driver_data = info;

	dev_set_drvdata(&dev->dev, info);





	err = register_netdev(info->netdev);

	err = register_netdev(info->netdev);

	if (err) {

	if (err) {
@@ -1233,7 +1233,7 @@ static int __devinit netfront_probe(struct xenbus_device *dev, 




 fail:

 fail:

	free_netdev(netdev);

	free_netdev(netdev);

	dev->dev.driver_data = NULL;

	dev_set_drvdata(&dev->dev, NULL);

	return err;

	return err;

}

}
@@ -1275,7 +1275,7 @@ static void xennet_disconnect_backend(struct netfront_info *info) 
 */

 */

static int netfront_resume(struct xenbus_device *dev)

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);

	dev_dbg(&dev->dev, "%s\n", dev->nodename);
@@ -1600,7 +1600,7 @@ static int xennet_connect(struct net_device *dev) 
static void backend_changed(struct xenbus_device *dev,

static void backend_changed(struct xenbus_device *dev,

			    enum xenbus_state backend_state)

			    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;

	struct net_device *netdev = np->netdev;





	dev_dbg(&dev->dev, "%s\n", xenbus_strstate(backend_state));

	dev_dbg(&dev->dev, "%s\n", xenbus_strstate(backend_state));
@@ -1774,7 +1774,7 @@ static struct xenbus_device_id netfront_ids[] = { 




static int __devexit xennet_remove(struct xenbus_device *dev)

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);

	dev_dbg(&dev->dev, "%s\n", dev->nodename);

drivers/video/xen-fbfront.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -384,7 +384,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, 
		fb_size = XENFB_DEFAULT_FB_LEN;

		fb_size = XENFB_DEFAULT_FB_LEN;

	}

	}





	dev->dev.driver_data = info;

	dev_set_drvdata(&dev->dev, info);

	info->xbdev = dev;

	info->xbdev = dev;

	info->irq = -1;

	info->irq = -1;

	info->x1 = info->y1 = INT_MAX;

	info->x1 = info->y1 = INT_MAX;
@@ -503,7 +503,7 @@ xenfb_make_preferred_console(void) 




static int xenfb_resume(struct xenbus_device *dev)

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_disconnect_backend(info);

	xenfb_init_shared_page(info, info->fb_info);

	xenfb_init_shared_page(info, info->fb_info);
@@ -512,7 +512,7 @@ static int xenfb_resume(struct xenbus_device *dev) 




static int xenfb_remove(struct xenbus_device *dev)

static 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);

	xenfb_disconnect_backend(info);

	if (info->fb_info) {

	if (info->fb_info) {
@@ -621,7 +621,7 @@ static void xenfb_disconnect_backend(struct xenfb_info *info) 
static void xenfb_backend_changed(struct xenbus_device *dev,

static void xenfb_backend_changed(struct xenbus_device *dev,

				  enum xenbus_state backend_state)

				  enum xenbus_state backend_state)

{

{

	struct xenfb_info *info = dev->dev.driver_data;

	struct xenfb_info *info = dev_get_drvdata(&dev->dev);

	int val;

	int val;





	switch (backend_state) {

	switch (backend_state) {