aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sis
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-09-12 03:00:31 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-09-19 06:30:09 -0400
commitf9af73c6f688630fbf84aa2361772613b36021ee (patch)
tree46daf59a3c52b9e8b0596a1cf018949286c6feb7 /drivers/video/sis
parentf1260e3ec4c4abaadf2a68cf1378a613fb885bbe (diff)
video: sisfb: 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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/sis')
-rw-r--r--drivers/video/sis/sis_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 977e27927a21..793b40238fca 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -5994,7 +5994,6 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
5994 if(!ivideo->sisvga_enabled) { 5994 if(!ivideo->sisvga_enabled) {
5995 if(pci_enable_device(pdev)) { 5995 if(pci_enable_device(pdev)) {
5996 if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); 5996 if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
5997 pci_set_drvdata(pdev, NULL);
5998 framebuffer_release(sis_fb_info); 5997 framebuffer_release(sis_fb_info);
5999 return -EIO; 5998 return -EIO;
6000 } 5999 }
@@ -6211,7 +6210,6 @@ error_3: vfree(ivideo->bios_abase);
6211 pci_dev_put(ivideo->lpcdev); 6210 pci_dev_put(ivideo->lpcdev);
6212 if(ivideo->nbridge) 6211 if(ivideo->nbridge)
6213 pci_dev_put(ivideo->nbridge); 6212 pci_dev_put(ivideo->nbridge);
6214 pci_set_drvdata(pdev, NULL);
6215 if(!ivideo->sisvga_enabled) 6213 if(!ivideo->sisvga_enabled)
6216 pci_disable_device(pdev); 6214 pci_disable_device(pdev);
6217 framebuffer_release(sis_fb_info); 6215 framebuffer_release(sis_fb_info);
@@ -6523,8 +6521,6 @@ static void sisfb_remove(struct pci_dev *pdev)
6523 mtrr_del(ivideo->mtrr, ivideo->video_base, ivideo->video_size); 6521 mtrr_del(ivideo->mtrr, ivideo->video_base, ivideo->video_size);
6524#endif 6522#endif
6525 6523
6526 pci_set_drvdata(pdev, NULL);
6527
6528 /* If device was disabled when starting, disable 6524 /* If device was disabled when starting, disable
6529 * it when quitting. 6525 * it when quitting.
6530 */ 6526 */