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

Commit df33db0f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pci_set_drvdata' 



Jingoo Han syas:

====================
ethernet: remove unnecessary pci_set_drvdata() part 4

Since commit 0998d063
(device-core: Ensure drvdata = NULL when no driver is bound),
the driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 305a3388 a3b8a16b

drivers/net/ethernet/sun/niu.c

+0 −2
Original line number Diff line number Diff line
@@ -9875,7 +9875,6 @@ static int niu_pci_init_one(struct pci_dev *pdev, 


err_out_disable_pdev:

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);



	return err;

}
@@ -9900,7 +9899,6 @@ static void niu_pci_remove_one(struct pci_dev *pdev) 
		free_netdev(dev);

		pci_release_regions(pdev);

		pci_disable_device(pdev);

		pci_set_drvdata(pdev, NULL);

	}

}

drivers/net/ethernet/sun/sungem.c

+0 −2
Original line number Diff line number Diff line
@@ -2806,8 +2806,6 @@ static void gem_remove_one(struct pci_dev *pdev) 
		iounmap(gp->regs);

		pci_release_regions(pdev);

		free_netdev(dev);



		pci_set_drvdata(pdev, NULL);

	}

}

drivers/net/ethernet/tehuti/tehuti.c

+0 −1
Original line number Diff line number Diff line
@@ -2447,7 +2447,6 @@ static void bdx_remove(struct pci_dev *pdev) 
	iounmap(nic->regs);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

	vfree(nic);



	RET();

drivers/net/ethernet/ti/tlan.c

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ static void tlan_remove_one(struct pci_dev *pdev) 


	free_netdev(dev);



	pci_set_drvdata(pdev, NULL);

	cancel_work_sync(&priv->tlan_tqueue);

}

drivers/net/ethernet/toshiba/spider_net.c

+0 −1
Original line number Diff line number Diff line
@@ -2478,7 +2478,6 @@ spider_net_setup_pci_dev(struct pci_dev *pdev) 
	pci_release_regions(pdev);

out_disable_dev:

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

	return NULL;

}