net: remove driver_data direct access of struct device from more drivers
Subsystems (2)
PATCH 1/1 net: 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/net/ehea/ehea_main.c | 8 ++++---- drivers/net/ibmveth.c | 8 ++++---- drivers/net/sb1250-mac.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/ehea/ehea_main.c +4 -4
@@ -3256,7 +3256,7 @@ static ssize_t ehea_probe_port(struct destruct device_attribute *attr, const char *buf, size_t count) { - struct ehea_adapter *adapter = dev->driver_data; + struct ehea_adapter *adapter = dev_get_drvdata(dev);struct ehea_port *port;struct device_node *eth_dn =NULL ;int i;
@@ -3311,7 +3311,7 @@ static ssize_t ehea_remove_port(struct dstruct device_attribute *attr, const char *buf, size_t count) { - struct ehea_adapter *adapter = dev->driver_data; + struct ehea_adapter *adapter = dev_get_drvdata(dev);struct ehea_port *port;int i;u32 logical_port_id;
@@ -3399,7 +3399,7 @@ static int __devinit ehea_probe_adapter( adapter->pd =EHEA_PD_ID ; - dev->dev.driver_data = adapter; +dev_set_drvdata (&dev->dev, adapter);/* initialize adapter and ports */
@@ -3463,7 +3463,7 @@ out: static int __devexit ehea_remove(struct of_device *dev) { -struct ehea_adapter *adapter = dev->dev.driver_data; +struct ehea_adapter *adapter =dev_get_drvdata (&dev->dev);int i;for (i =0 ; i <EHEA_MAX_PORTS ; i++)
drivers/net/ibmveth.c +4 -4
@@ -1241,7 +1241,7 @@ static int __devinit ibmveth_probe(strucreturn -ENOMEM ; adapter =netdev_priv (netdev); - dev->dev.driver_data = netdev; +dev_set_drvdata (&dev->dev, netdev); adapter->vdev = dev; adapter->netdev = netdev;
@@ -1335,7 +1335,7 @@ static int __devinit ibmveth_probe(struc static int __devexit ibmveth_remove(struct vio_dev *dev) { -struct net_device *netdev = dev->dev.driver_data; +struct net_device *netdev =dev_get_drvdata (&dev->dev);struct ibmveth_adapter *adapter =netdev_priv (netdev);int i;
@@ -1468,8 +1468,8 @@ const char * buf, size_t count)struct ibmveth_buff_pool *pool =container_of (kobj, struct ibmveth_buff_pool, kobj); -struct net_device *netdev = - container_of(kobj->parent, struct device, kobj)->driver_data; +struct net_device *netdev =dev_get_drvdata ( + container_of(kobj->parent, struct device, kobj));struct ibmveth_adapter *adapter =netdev_priv (netdev);long value =simple_strtol (buf,NULL ,10 );long rc;
drivers/net/sb1250-mac.c +3 -3
@@ -2285,7 +2285,7 @@ static int sb1250_change_mtu(struct net_static int sbmac_init (struct platform_device *pldev,long long base) { -struct net_device *dev = pldev->dev.driver_data; +struct net_device *dev =dev_get_drvdata (&pldev->dev);int idx = pldev->id;struct sbmac_softc *sc =netdev_priv (dev);unsigned char *eaddr;
@@ -2726,7 +2726,7 @@ static int __init sbmac_probe(struct pla goto out_unmap; } - pldev->dev.driver_data = dev; +dev_set_drvdata (&pldev->dev, dev);SET_NETDEV_DEV (dev, &pldev->dev); sc =netdev_priv (dev);
@@ -2751,7 +2751,7 @@ out_out: static int __exit sbmac_remove(struct platform_device *pldev) { -struct net_device *dev = pldev->dev.driver_data; +struct net_device *dev =dev_get_drvdata (&pldev->dev);struct sbmac_softc *sc =netdev_priv (dev);unregister_netdev (dev);
From: Greg Kroah-Hartman <[email protected]>
Date: Mon, 4 May 2009 13:01:45 -0700
Quoted 7 lines
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.Signed-off-by Greg Kroah-Hartman <[email protected]>
Applied to net-next-2.6, thanks!