Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] pm3fb: kill pci_find_device usage

Signed-off-by: Alan Cox <alan@redhat.com>
Acked-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alan and committed by
Linus Torvalds
3aebbd8f 33e321b4

+11 -18
+11 -18
drivers/video/pm3fb.c
··· 3299 3299 fb_info[i].dev = NULL; 3300 3300 } 3301 3301 3302 - dev = 3303 - pci_find_device(PCI_VENDOR_ID_3DLABS, 3302 + dev = pci_get_device(PCI_VENDOR_ID_3DLABS, 3304 3303 PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev); 3305 3304 3306 3305 for (i = 0; ((i < PM3_MAX_BOARD) && dev); i++) { 3307 3306 dev_array[i] = dev; 3308 - dev = 3309 - pci_find_device(PCI_VENDOR_ID_3DLABS, 3307 + dev = pci_get_device(PCI_VENDOR_ID_3DLABS, 3310 3308 PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev); 3311 3309 } 3312 3310 ··· 3351 3353 /* now, initialize... or not */ 3352 3354 for (i = 0; i < PM3_MAX_BOARD; i++) { 3353 3355 l_fb_info = &(fb_info[i]); 3354 - if ((l_fb_info->dev) && (!disable[i])) { /* PCI device was found and not disabled by user */ 3356 + if (l_fb_info->dev && !disable[i]) { /* PCI device was found and not disabled by user */ 3355 3357 DPRINTK(2, 3356 3358 "found @%lx Vendor %lx Device %lx ; base @ : %lx - %lx - %lx - %lx - %lx - %lx, irq %ld\n", 3357 3359 (unsigned long) l_fb_info->dev, ··· 3606 3608 3607 3609 pm3fb_init(); 3608 3610 3609 - return (0); 3611 + return 0; 3610 3612 } 3611 3613 3612 3614 void cleanup_module(void) ··· 3617 3619 struct pm3fb_info *l_fb_info; 3618 3620 for (i = 0; i < PM3_MAX_BOARD; i++) { 3619 3621 l_fb_info = &(fb_info[i]); 3620 - if ((l_fb_info->dev != NULL) 3621 - && (!(disable[l_fb_info->board_num]))) { 3622 - if (l_fb_info->vIOBase != 3623 - (unsigned char *) -1) { 3622 + pci_dev_put(l_fb_info->dev); 3623 + if (l_fb_info->dev != NULL && !(disable[l_fb_info->board_num])) { 3624 + if (l_fb_info->vIOBase != (unsigned char *) -1) { 3624 3625 pm3fb_unmapIO(l_fb_info); 3625 3626 release_mem_region(l_fb_info->p_fb, 3626 - l_fb_info-> 3627 - fb_size); 3628 - release_mem_region(l_fb_info-> 3629 - pIOBase, 3630 - PM3_REGS_SIZE); 3627 + l_fb_info->fb_size); 3628 + release_mem_region(l_fb_info->pIOBase, 3629 + PM3_REGS_SIZE); 3631 3630 } 3632 - unregister_framebuffer(&l_fb_info->gen. 3633 - info); 3631 + unregister_framebuffer(&l_fb_info->gen.info); 3634 3632 } 3635 3633 } 3636 3634 } 3637 - return; 3638 3635 } 3639 3636 #endif /* MODULE */