diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-09-10 07:12:51 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-09-21 09:43:16 -0400 |
commit | a0c7d83322521880caf8c9c1ef20a2a1cd5cb955 (patch) | |
tree | 6437db0e99345023ec5bf3228cfc766d5639385f | |
parent | aa86858c356beb72af86107612ac854c0150d6db (diff) |
can: sja1000: 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: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r-- | drivers/net/can/sja1000/ems_pci.c | 1 | ||||
-rw-r--r-- | drivers/net/can/sja1000/kvaser_pci.c | 1 | ||||
-rw-r--r-- | drivers/net/can/sja1000/peak_pci.c | 2 | ||||
-rw-r--r-- | drivers/net/can/sja1000/plx_pci.c | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c index 3752342a678a..835921388e7b 100644 --- a/drivers/net/can/sja1000/ems_pci.c +++ b/drivers/net/can/sja1000/ems_pci.c | |||
@@ -207,7 +207,6 @@ static void ems_pci_del_card(struct pci_dev *pdev) | |||
207 | kfree(card); | 207 | kfree(card); |
208 | 208 | ||
209 | pci_disable_device(pdev); | 209 | pci_disable_device(pdev); |
210 | pci_set_drvdata(pdev, NULL); | ||
211 | } | 210 | } |
212 | 211 | ||
213 | static void ems_pci_card_reset(struct ems_pci_card *card) | 212 | static void ems_pci_card_reset(struct ems_pci_card *card) |
diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c index 217585b97cd3..087b13bd300e 100644 --- a/drivers/net/can/sja1000/kvaser_pci.c +++ b/drivers/net/can/sja1000/kvaser_pci.c | |||
@@ -387,7 +387,6 @@ static void kvaser_pci_remove_one(struct pci_dev *pdev) | |||
387 | 387 | ||
388 | pci_release_regions(pdev); | 388 | pci_release_regions(pdev); |
389 | pci_disable_device(pdev); | 389 | pci_disable_device(pdev); |
390 | pci_set_drvdata(pdev, NULL); | ||
391 | } | 390 | } |
392 | 391 | ||
393 | static struct pci_driver kvaser_pci_driver = { | 392 | static struct pci_driver kvaser_pci_driver = { |
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c index 6b6f0ad75090..065ca49eb45e 100644 --- a/drivers/net/can/sja1000/peak_pci.c +++ b/drivers/net/can/sja1000/peak_pci.c | |||
@@ -744,8 +744,6 @@ static void peak_pci_remove(struct pci_dev *pdev) | |||
744 | pci_iounmap(pdev, cfg_base); | 744 | pci_iounmap(pdev, cfg_base); |
745 | pci_release_regions(pdev); | 745 | pci_release_regions(pdev); |
746 | pci_disable_device(pdev); | 746 | pci_disable_device(pdev); |
747 | |||
748 | pci_set_drvdata(pdev, NULL); | ||
749 | } | 747 | } |
750 | 748 | ||
751 | static struct pci_driver peak_pci_driver = { | 749 | static struct pci_driver peak_pci_driver = { |
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c index c52c1e96bf90..f9b4f81cd86a 100644 --- a/drivers/net/can/sja1000/plx_pci.c +++ b/drivers/net/can/sja1000/plx_pci.c | |||
@@ -477,7 +477,6 @@ static void plx_pci_del_card(struct pci_dev *pdev) | |||
477 | kfree(card); | 477 | kfree(card); |
478 | 478 | ||
479 | pci_disable_device(pdev); | 479 | pci_disable_device(pdev); |
480 | pci_set_drvdata(pdev, NULL); | ||
481 | } | 480 | } |
482 | 481 | ||
483 | /* | 482 | /* |