Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aebbd8f authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

[PATCH] pm3fb: kill pci_find_device usage 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Acked-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 33e321b4

drivers/video/pm3fb.c

+11 −18
Original line number Original line Diff line number Diff line
@@ -3299,14 +3299,12 @@ static void pm3fb_detect(void) 
		fb_info[i].dev = NULL;

		fb_info[i].dev = NULL;

	}

	}





	dev =

	dev = pci_get_device(PCI_VENDOR_ID_3DLABS,

	    pci_find_device(PCI_VENDOR_ID_3DLABS,

			    PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);

			    PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);





	for (i = 0; ((i < PM3_MAX_BOARD) && dev); i++) {

	for (i = 0; ((i < PM3_MAX_BOARD) && dev); i++) {

		dev_array[i] = dev;

		dev_array[i] = dev;

		dev =

		dev = pci_get_device(PCI_VENDOR_ID_3DLABS,

		    pci_find_device(PCI_VENDOR_ID_3DLABS,

				    PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);

				    PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);

	}

	}
@@ -3353,7 +3351,7 @@ static void pm3fb_detect(void) 
	/* now, initialize... or not */

	/* now, initialize... or not */

	for (i = 0; i < PM3_MAX_BOARD; i++) {

	for (i = 0; i < PM3_MAX_BOARD; i++) {

		l_fb_info = &(fb_info[i]);

		l_fb_info = &(fb_info[i]);

		if ((l_fb_info->dev) && (!disable[i])) {	/* PCI device was found and not disabled by user */

		if (l_fb_info->dev && !disable[i]) {	/* PCI device was found and not disabled by user */

			DPRINTK(2,

			DPRINTK(2,

				"found @%lx Vendor %lx Device %lx ; base @ : %lx - %lx - %lx - %lx - %lx - %lx, irq %ld\n",

				"found @%lx Vendor %lx Device %lx ; base @ : %lx - %lx - %lx - %lx - %lx - %lx, irq %ld\n",

				(unsigned long) l_fb_info->dev,

				(unsigned long) l_fb_info->dev,
@@ -3608,7 +3606,7 @@ int init_module(void) 




	pm3fb_init();

	pm3fb_init();





	return (0);

	return 0;

}

}





void cleanup_module(void)

void cleanup_module(void)
@@ -3619,23 +3617,18 @@ void cleanup_module(void) 
		struct pm3fb_info *l_fb_info;

		struct pm3fb_info *l_fb_info;

		for (i = 0; i < PM3_MAX_BOARD; i++) {

		for (i = 0; i < PM3_MAX_BOARD; i++) {

			l_fb_info = &(fb_info[i]);

			l_fb_info = &(fb_info[i]);

			if ((l_fb_info->dev != NULL)

			pci_dev_put(l_fb_info->dev);

			    && (!(disable[l_fb_info->board_num]))) {

			if (l_fb_info->dev != NULL  && !(disable[l_fb_info->board_num])) {

				if (l_fb_info->vIOBase !=

				if (l_fb_info->vIOBase != (unsigned char *) -1) {

				    (unsigned char *) -1) {

					pm3fb_unmapIO(l_fb_info);

					pm3fb_unmapIO(l_fb_info);

					release_mem_region(l_fb_info->p_fb,

					release_mem_region(l_fb_info->p_fb,

							   l_fb_info->

						   l_fb_info->fb_size);

							   fb_size);

					release_mem_region(l_fb_info->pIOBase,

					release_mem_region(l_fb_info->

							   pIOBase,

						   PM3_REGS_SIZE);

						   PM3_REGS_SIZE);

				}

				}

				unregister_framebuffer(&l_fb_info->gen.

				unregister_framebuffer(&l_fb_info->gen.info);

						       info);

			}

			}

		}

		}

	}

	}

	return;

}

}

#endif /* MODULE */
 
#endif /* MODULE */