From: Jingoo Han <jg1.han@samsung.com>
Date: Mon, 21 Oct 2013 02:13:07 +0000 (+0900)
Subject: net: e100: remove unnecessary pci_set_drvdata()
X-Git-Tag: v3.13-rc1~105^2~153^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4722cd4d3036c7fd97af0d3aedc869746f1f0cb2;p=thirdparty%2Flinux.git

net: e100: 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: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index ada6e210279f3..cbaba4442d4b2 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2985,7 +2985,6 @@ err_out_free_res:
 err_out_disable_pdev:
 	pci_disable_device(pdev);
 err_out_free_dev:
-	pci_set_drvdata(pdev, NULL);
 	free_netdev(netdev);
 	return err;
 }
@@ -3003,7 +3002,6 @@ static void e100_remove(struct pci_dev *pdev)
 		free_netdev(netdev);
 		pci_release_regions(pdev);
 		pci_disable_device(pdev);
-		pci_set_drvdata(pdev, NULL);
 	}
 }