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>
This commit is contained in:
Родитель
f1260e3ec4
Коммит
f9af73c6f6
|
@ -5994,7 +5994,6 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
if(!ivideo->sisvga_enabled) {
|
if(!ivideo->sisvga_enabled) {
|
||||||
if(pci_enable_device(pdev)) {
|
if(pci_enable_device(pdev)) {
|
||||||
if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
|
if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
|
||||||
pci_set_drvdata(pdev, NULL);
|
|
||||||
framebuffer_release(sis_fb_info);
|
framebuffer_release(sis_fb_info);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
@ -6211,7 +6210,6 @@ error_3: vfree(ivideo->bios_abase);
|
||||||
pci_dev_put(ivideo->lpcdev);
|
pci_dev_put(ivideo->lpcdev);
|
||||||
if(ivideo->nbridge)
|
if(ivideo->nbridge)
|
||||||
pci_dev_put(ivideo->nbridge);
|
pci_dev_put(ivideo->nbridge);
|
||||||
pci_set_drvdata(pdev, NULL);
|
|
||||||
if(!ivideo->sisvga_enabled)
|
if(!ivideo->sisvga_enabled)
|
||||||
pci_disable_device(pdev);
|
pci_disable_device(pdev);
|
||||||
framebuffer_release(sis_fb_info);
|
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);
|
mtrr_del(ivideo->mtrr, ivideo->video_base, ivideo->video_size);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
pci_set_drvdata(pdev, NULL);
|
|
||||||
|
|
||||||
/* If device was disabled when starting, disable
|
/* If device was disabled when starting, disable
|
||||||
* it when quitting.
|
* it when quitting.
|
||||||
*/
|
*/
|
||||||
|
|
Загрузка…
Ссылка в новой задаче