aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-20 04:36:14 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-10-17 05:01:05 -0400
commitc0d4021f6ca04061f5b17a1468eed666ebe43e67 (patch)
tree4d822b8d19b2354e4149bdb238d9ea0996a5f5b1
parentd441a4aaae61cf1ae27ec8f59f798701e2769f39 (diff)
[media] pci: cx88: 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: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/pci/cx88/cx88-alsa.c2
-rw-r--r--drivers/media/pci/cx88/cx88-mpeg.c1
-rw-r--r--drivers/media/pci/cx88/cx88-video.c1
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index 4a3f96ee3147..11d069295032 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -935,8 +935,6 @@ static void cx88_audio_finidev(struct pci_dev *pci)
935 935
936 snd_card_free((void *)card); 936 snd_card_free((void *)card);
937 937
938 pci_set_drvdata(pci, NULL);
939
940 devno--; 938 devno--;
941} 939}
942 940
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index e31a75fefbdf..684eff57717f 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -520,7 +520,6 @@ static void cx8802_fini_common(struct cx8802_dev *dev)
520 520
521 /* unregister stuff */ 521 /* unregister stuff */
522 free_irq(dev->pci->irq, dev); 522 free_irq(dev->pci->irq, dev);
523 pci_set_drvdata(dev->pci, NULL);
524 523
525 /* free memory */ 524 /* free memory */
526 btcx_riscmem_free(dev->pci,&dev->mpegq.stopper); 525 btcx_riscmem_free(dev->pci,&dev->mpegq.stopper);
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 356725ce608d..1aed764a35dd 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1922,7 +1922,6 @@ static void cx8800_finidev(struct pci_dev *pci_dev)
1922 1922
1923 free_irq(pci_dev->irq, dev); 1923 free_irq(pci_dev->irq, dev);
1924 cx8800_unregister_video(dev); 1924 cx8800_unregister_video(dev);
1925 pci_set_drvdata(pci_dev, NULL);
1926 1925
1927 /* free memory */ 1926 /* free memory */
1928 btcx_riscmem_free(dev->pci,&dev->vidq.stopper); 1927 btcx_riscmem_free(dev->pci,&dev->vidq.stopper);