]> git.karo-electronics.de Git - linux-beck.git/commitdiff
net: starfire: remove unnecessary pci_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Fri, 18 Oct 2013 00:18:53 +0000 (09:18 +0900)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Oct 2013 04:03:28 +0000 (00:03 -0400)
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>
drivers/net/ethernet/adaptec/starfire.c

index 8b04bfc20cfba3b9c17984471dfccb6163799bdb..171d73c1d3c22de3209ca6c48b7978c35b2a38b0 100644 (file)
@@ -835,7 +835,6 @@ static int starfire_init_one(struct pci_dev *pdev,
        return 0;
 
 err_out_cleardev:
-       pci_set_drvdata(pdev, NULL);
        iounmap(base);
 err_out_free_res:
        pci_release_regions (pdev);
@@ -2012,7 +2011,6 @@ static void starfire_remove_one(struct pci_dev *pdev)
        iounmap(np->base);
        pci_release_regions(pdev);
 
-       pci_set_drvdata(pdev, NULL);
        free_netdev(dev);                       /* Will also free np!! */
 }