From: Wei Yongjun Date: Mon, 15 Aug 2016 22:50:34 +0000 (+0000) Subject: net: ena: Remove unnecessary pci_set_drvdata() X-Git-Tag: v4.9-rc1~14^2~95 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=557bc7d44d52d52374bc72e9cc3b0beb41026886;p=karo-tx-linux.git net: ena: 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: Wei Yongjun Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index 94790df2d559..499a22b165f1 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -3060,7 +3060,6 @@ err_device_destroy: err_free_region: ena_release_bars(ena_dev, pdev); err_free_ena_dev: - pci_set_drvdata(pdev, NULL); vfree(ena_dev); err_disable_device: pci_disable_device(pdev); @@ -3156,8 +3155,6 @@ static void ena_remove(struct pci_dev *pdev) ena_release_bars(ena_dev, pdev); - pci_set_drvdata(pdev, NULL); - pci_disable_device(pdev); ena_com_destroy_interrupt_moderation(ena_dev);