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

Commit 726a2fbe authored by Jingoo Han's avatar Jingoo Han Committed by David S. Miller
Browse files

net: r6040: remove unnecessary pci_set_drvdata() 



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 avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 901ea1a9

drivers/net/ethernet/rdc/r6040.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1231,7 +1231,6 @@ static int r6040_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	mdiobus_free(lp->mii_bus);

	mdiobus_free(lp->mii_bus);

err_out_unmap:

err_out_unmap:

	netif_napi_del(&lp->napi);

	netif_napi_del(&lp->napi);

	pci_set_drvdata(pdev, NULL);

	pci_iounmap(pdev, ioaddr);

	pci_iounmap(pdev, ioaddr);

err_out_free_res:

err_out_free_res:

	pci_release_regions(pdev);

	pci_release_regions(pdev);
@@ -1257,7 +1256,6 @@ static void r6040_remove_one(struct pci_dev *pdev) 
	pci_release_regions(pdev);

	pci_release_regions(pdev);

	free_netdev(dev);

	free_netdev(dev);

	pci_disable_device(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

}

}