From: Jingoo Han Date: Mon, 9 Dec 2013 03:29:08 +0000 (+0900) Subject: irda: vlsi_ir: remove unnecessary pci_set_drvdata() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=825d15de0e6698ba23790870edb031a5c120819b;p=deliverable%2Flinux.git irda: vlsi_ir: 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index cc9b8665e73c..485006604bbc 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c @@ -1693,7 +1693,6 @@ out_freedev: out_disable: pci_disable_device(pdev); out: - pci_set_drvdata(pdev, NULL); return -ENODEV; } @@ -1719,8 +1718,6 @@ static void vlsi_irda_remove(struct pci_dev *pdev) free_netdev(ndev); - pci_set_drvdata(pdev, NULL); - IRDA_MESSAGE("%s: %s removed\n", drivername, pci_name(pdev)); }