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

Commit 1aec5bdf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by David S. Miller
Browse files

net: remove driver_data direct access of struct device 



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: netdev@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aba74530

drivers/net/3c509.c

+6 −6
Original line number Diff line number Diff line
@@ -653,11 +653,11 @@ static int __init el3_mca_probe(struct device *device) 
	netdev_boot_setup_check(dev);



	el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_MCA);

	device->driver_data = dev;

	dev_set_drvdata(device, dev);

	err = el3_common_init(dev);



	if (err) {

		device->driver_data = NULL;

		dev_set_drvdata(device, NULL);

		free_netdev(dev);

		return -ENOMEM;

	}
@@ -721,12 +721,12 @@ static int __init el3_eisa_probe (struct device *device) 


/* This remove works for all device types.

 *

 * The net dev must be stored in the driver_data field */

 * The net dev must be stored in the driver data field */

static int __devexit el3_device_remove (struct device *device)

{

	struct net_device *dev;



	dev  = device->driver_data;

	dev = dev_get_drvdata(device);



	el3_common_remove (dev);

	return 0;
@@ -1451,7 +1451,7 @@ el3_suspend(struct device *pdev, pm_message_t state) 
	struct el3_private *lp;

	int ioaddr;



	dev = pdev->driver_data;

	dev = dev_get_drvdata(pdev);

	lp = netdev_priv(dev);

	ioaddr = dev->base_addr;
@@ -1475,7 +1475,7 @@ el3_resume(struct device *pdev) 
	struct el3_private *lp;

	int ioaddr;



	dev = pdev->driver_data;

	dev = dev_get_drvdata(pdev);

	lp = netdev_priv(dev);

	ioaddr = dev->base_addr;

drivers/net/depca.c

+2 −2
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device) 


	dev->mem_start = 0;



	device->driver_data = dev;

	dev_set_drvdata(device, dev);

	SET_NETDEV_DEV (dev, device);



	status = register_netdev(dev);
@@ -1614,7 +1614,7 @@ static int __devexit depca_device_remove (struct device *device) 
	struct depca_private *lp;

	int bus;



	dev  = device->driver_data;

	dev  = dev_get_drvdata(device);

	lp   = netdev_priv(dev);



	unregister_netdev (dev);

drivers/net/hp100.c

+2 −2
Original line number Diff line number Diff line
@@ -2864,7 +2864,7 @@ static int __init hp100_eisa_probe (struct device *gendev) 
	printk("hp100: %s: EISA adapter found at 0x%x\n", dev->name,

	       dev->base_addr);

#endif

	gendev->driver_data = dev;

	dev_set_drvdata(gendev, dev);

	return 0;

 out1:

	free_netdev(dev);
@@ -2873,7 +2873,7 @@ static int __init hp100_eisa_probe (struct device *gendev) 


static int __devexit hp100_eisa_remove (struct device *gendev)

{

	struct net_device *dev = gendev->driver_data;

	struct net_device *dev = dev_get_drvdata(gendev);

	cleanup_dev(dev);

	return 0;

}

drivers/net/ne3210.c

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static int __init ne3210_eisa_probe (struct device *device) 
	}



	SET_NETDEV_DEV(dev, device);

	device->driver_data = dev;

	dev_set_drvdata(device, dev);

	ioaddr = edev->base_addr;



	if (!request_region(ioaddr, NE3210_IO_EXTENT, DRV_NAME)) {
@@ -225,7 +225,7 @@ static int __init ne3210_eisa_probe (struct device *device) 


static int __devexit ne3210_eisa_remove (struct device *device)

{

	struct net_device  *dev    = device->driver_data;

	struct net_device  *dev    = dev_get_drvdata(device);

	unsigned long       ioaddr = to_eisa_device (device)->base_addr;



	unregister_netdev (dev);

drivers/net/smc-mca.c

+2 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int __init ultramca_probe(struct device *gen_dev) 


	outb(reg4, ioaddr + 4);



	gen_dev->driver_data = dev;

	dev_set_drvdata(gen_dev, dev);



	/* The 8390 isn't at the base address, so fake the offset

	 */
@@ -531,7 +531,7 @@ static int ultramca_close_card(struct net_device *dev) 
static int ultramca_remove(struct device *gen_dev)

{

	struct mca_device *mca_dev = to_mca_device(gen_dev);

	struct net_device *dev = (struct net_device *)gen_dev->driver_data;

	struct net_device *dev = dev_get_drvdata(gen_dev);



	if (dev) {

		/* NB: ultra_close_card() does free_irq */