diff options
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index f67325387902..8d88daeed0c6 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -1212,7 +1212,7 @@ static int __devinit netfront_probe(struct xenbus_device *dev, | |||
| 1212 | } | 1212 | } |
| 1213 | 1213 | ||
| 1214 | info = netdev_priv(netdev); | 1214 | info = netdev_priv(netdev); |
| 1215 | dev->dev.driver_data = info; | 1215 | dev_set_drvdata(&dev->dev, info); |
| 1216 | 1216 | ||
| 1217 | err = register_netdev(info->netdev); | 1217 | err = register_netdev(info->netdev); |
| 1218 | if (err) { | 1218 | if (err) { |
| @@ -1233,7 +1233,7 @@ static int __devinit netfront_probe(struct xenbus_device *dev, | |||
| 1233 | 1233 | ||
| 1234 | fail: | 1234 | fail: |
| 1235 | free_netdev(netdev); | 1235 | free_netdev(netdev); |
| 1236 | dev->dev.driver_data = NULL; | 1236 | dev_set_drvdata(&dev->dev, NULL); |
| 1237 | return err; | 1237 | return err; |
| 1238 | } | 1238 | } |
| 1239 | 1239 | ||
| @@ -1275,7 +1275,7 @@ static void xennet_disconnect_backend(struct netfront_info *info) | |||
| 1275 | */ | 1275 | */ |
| 1276 | static int netfront_resume(struct xenbus_device *dev) | 1276 | static int netfront_resume(struct xenbus_device *dev) |
| 1277 | { | 1277 | { |
| 1278 | struct netfront_info *info = dev->dev.driver_data; | 1278 | struct netfront_info *info = dev_get_drvdata(&dev->dev); |
| 1279 | 1279 | ||
| 1280 | dev_dbg(&dev->dev, "%s\n", dev->nodename); | 1280 | dev_dbg(&dev->dev, "%s\n", dev->nodename); |
| 1281 | 1281 | ||
| @@ -1600,7 +1600,7 @@ static int xennet_connect(struct net_device *dev) | |||
| 1600 | static void backend_changed(struct xenbus_device *dev, | 1600 | static void backend_changed(struct xenbus_device *dev, |
| 1601 | enum xenbus_state backend_state) | 1601 | enum xenbus_state backend_state) |
| 1602 | { | 1602 | { |
| 1603 | struct netfront_info *np = dev->dev.driver_data; | 1603 | struct netfront_info *np = dev_get_drvdata(&dev->dev); |
| 1604 | struct net_device *netdev = np->netdev; | 1604 | struct net_device *netdev = np->netdev; |
| 1605 | 1605 | ||
| 1606 | dev_dbg(&dev->dev, "%s\n", xenbus_strstate(backend_state)); | 1606 | dev_dbg(&dev->dev, "%s\n", xenbus_strstate(backend_state)); |
| @@ -1774,7 +1774,7 @@ static struct xenbus_device_id netfront_ids[] = { | |||
| 1774 | 1774 | ||
| 1775 | static int __devexit xennet_remove(struct xenbus_device *dev) | 1775 | static int __devexit xennet_remove(struct xenbus_device *dev) |
| 1776 | { | 1776 | { |
| 1777 | struct netfront_info *info = dev->dev.driver_data; | 1777 | struct netfront_info *info = dev_get_drvdata(&dev->dev); |
| 1778 | 1778 | ||
| 1779 | dev_dbg(&dev->dev, "%s\n", dev->nodename); | 1779 | dev_dbg(&dev->dev, "%s\n", dev->nodename); |
| 1780 | 1780 | ||
