video: sisfb: remove unnecessary pci_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Thu, 12 Sep 2013 07:00:31 +0000 (16:00 +0900)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 19 Sep 2013 10:30:09 +0000 (13:30 +0300)
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>
drivers/video/sis/sis_main.c

index 977e27927a211ab0fffcd37087f90e0c0fa86e9f..793b40238fcabb3f990a40ef333fa11e963a79e7 100644 (file)
@@ -5994,7 +5994,6 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if(!ivideo->sisvga_enabled) {
                if(pci_enable_device(pdev)) {
                        if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
-                       pci_set_drvdata(pdev, NULL);
                        framebuffer_release(sis_fb_info);
                        return -EIO;
                }
@@ -6211,7 +6210,6 @@ error_3:  vfree(ivideo->bios_abase);
                        pci_dev_put(ivideo->lpcdev);
                if(ivideo->nbridge)
                        pci_dev_put(ivideo->nbridge);
-               pci_set_drvdata(pdev, NULL);
                if(!ivideo->sisvga_enabled)
                        pci_disable_device(pdev);
                framebuffer_release(sis_fb_info);
@@ -6523,8 +6521,6 @@ static void sisfb_remove(struct pci_dev *pdev)
                mtrr_del(ivideo->mtrr, ivideo->video_base, ivideo->video_size);
 #endif
 
-       pci_set_drvdata(pdev, NULL);
-
        /* If device was disabled when starting, disable
         * it when quitting.
         */