aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonino Daplas <adaplas@hotpop.com>2005-03-30 16:46:17 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-30 16:46:17 -0800
commit66db5e895fcffb726e38e1b6455e11f89b6ce6ef (patch)
treed0ad4d9585e1fb0fb0cb1d7e15c96fd389681c88
parented5f9155a80ccfac36fad06d17823fd38ff0796c (diff)
downloadhistory-66db5e895fcffb726e38e1b6455e11f89b6ce6ef.tar.gz
[PATCH] sisfb: Trivial cleanups
sis_main.c vfree() checking cleanups. convert from pci_module_init to pci_register_driver (from:http://kerneljanitors.org/TODO). Signed-off by: James Lamanna <jlamanna@gmail.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/sis/sis_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 96a0d60e12ab8a..b773c98f6513d1 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -5640,7 +5640,7 @@ static void __devexit sisfb_remove(struct pci_dev *pdev)
/* Unmap */
iounmap(ivideo->video_vbase);
iounmap(ivideo->mmio_vbase);
- if(ivideo->bios_abase) vfree(ivideo->bios_abase);
+ vfree(ivideo->bios_abase);
/* Release mem regions */
release_mem_region(ivideo->video_base, ivideo->video_size);
@@ -5695,7 +5695,7 @@ SISINITSTATIC int __init sisfb_init(void)
sisfb_setup(options);
#endif
#endif
- return(pci_module_init(&sisfb_driver));
+ return(pci_register_driver(&sisfb_driver));
}
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)