aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-20 05:36:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-25 20:23:28 -0400
commitd47aa4536dfc9385e02a4dcbed2cf7bea3a18492 (patch)
tree7060d8b0e93c70eb341ba4acd5d2559caea19bfe
parentb85862654cdd9bfa71eb68ea8f672aa4fef15d22 (diff)
usb: gadget: Remove redundant pci_set_drvdata
Driver core sets driver data to NULL upon failure or remove. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/amd5536udc.c2
-rw-r--r--drivers/usb/gadget/goku_udc.c1
-rw-r--r--drivers/usb/gadget/net2280.c1
-rw-r--r--drivers/usb/gadget/pch_udc.c1
4 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index a9a4346c83aa..54a1e2954cea 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -3078,8 +3078,6 @@ static void udc_pci_remove(struct pci_dev *pdev)
3078 if (dev->active) 3078 if (dev->active)
3079 pci_disable_device(pdev); 3079 pci_disable_device(pdev);
3080 3080
3081 pci_set_drvdata(pdev, NULL);
3082
3083 udc_remove(dev); 3081 udc_remove(dev);
3084} 3082}
3085 3083
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index c64deb9e3d62..74bb8df82876 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1701,7 +1701,6 @@ static void goku_remove(struct pci_dev *pdev)
1701 if (dev->enabled) 1701 if (dev->enabled)
1702 pci_disable_device(pdev); 1702 pci_disable_device(pdev);
1703 1703
1704 pci_set_drvdata(pdev, NULL);
1705 dev->regs = NULL; 1704 dev->regs = NULL;
1706 1705
1707 INFO(dev, "unbind\n"); 1706 INFO(dev, "unbind\n");
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 0781bff70015..9fbc8fe5ecc0 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2680,7 +2680,6 @@ static void net2280_remove (struct pci_dev *pdev)
2680 if (dev->enabled) 2680 if (dev->enabled)
2681 pci_disable_device (pdev); 2681 pci_disable_device (pdev);
2682 device_remove_file (&pdev->dev, &dev_attr_registers); 2682 device_remove_file (&pdev->dev, &dev_attr_registers);
2683 pci_set_drvdata (pdev, NULL);
2684 2683
2685 INFO (dev, "unbind\n"); 2684 INFO (dev, "unbind\n");
2686} 2685}
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 24174e1d1564..32d5e923750b 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -3080,7 +3080,6 @@ static void pch_udc_remove(struct pci_dev *pdev)
3080 if (dev->active) 3080 if (dev->active)
3081 pci_disable_device(pdev); 3081 pci_disable_device(pdev);
3082 kfree(dev); 3082 kfree(dev);
3083 pci_set_drvdata(pdev, NULL);
3084} 3083}
3085 3084
3086#ifdef CONFIG_PM 3085#ifdef CONFIG_PM