[POWERPC] celleb: Fix parsing of machine type hack command line option

[powerpc.git] / drivers / video / pm3fb.c

diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 0e0f977..bd787e8 100644 (file)
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -57,7 +57,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -3300,14 +3299,12 @@ static void pm3fb_detect(void)
                fb_info[i].dev = NULL;
        }
 
-       dev =
-           pci_find_device(PCI_VENDOR_ID_3DLABS,
+       dev = pci_get_device(PCI_VENDOR_ID_3DLABS,
                            PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);
 
        for (i = 0; ((i < PM3_MAX_BOARD) && dev); i++) {
                dev_array[i] = dev;
-               dev =
-                   pci_find_device(PCI_VENDOR_ID_3DLABS,
+               dev = pci_get_device(PCI_VENDOR_ID_3DLABS,
                                    PCI_DEVICE_ID_3DLABS_PERMEDIA3, dev);
        }
 
@@ -3354,7 +3351,7 @@ static void pm3fb_detect(void)
        /* now, initialize... or not */
        for (i = 0; i < PM3_MAX_BOARD; 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,
                                "found @%lx Vendor %lx Device %lx ; base @ : %lx - %lx - %lx - %lx - %lx - %lx, irq %ld\n",
                                (unsigned long) l_fb_info->dev,
@@ -3609,7 +3606,7 @@ int init_module(void)
 
        pm3fb_init();
 
-       return (0);
+       return 0;
 }
 
 void cleanup_module(void)
@@ -3620,23 +3617,18 @@ void cleanup_module(void)
                struct pm3fb_info *l_fb_info;
                for (i = 0; i < PM3_MAX_BOARD; i++) {
                        l_fb_info = &(fb_info[i]);
-                       if ((l_fb_info->dev != NULL)
-                           && (!(disable[l_fb_info->board_num]))) {
-                               if (l_fb_info->vIOBase !=
-                                   (unsigned char *) -1) {
+                       pci_dev_put(l_fb_info->dev);
+                       if (l_fb_info->dev != NULL  && !(disable[l_fb_info->board_num])) {
+                               if (l_fb_info->vIOBase != (unsigned char *) -1) {
                                        pm3fb_unmapIO(l_fb_info);
                                        release_mem_region(l_fb_info->p_fb,
-                                                          l_fb_info->
-                                                          fb_size);
-                                       release_mem_region(l_fb_info->
-                                                          pIOBase,
-                                                          PM3_REGS_SIZE);
+                                                  l_fb_info->fb_size);
+                                       release_mem_region(l_fb_info->pIOBase,
+                                                  PM3_REGS_SIZE);
                                }
-                               unregister_framebuffer(&l_fb_info->gen.
-                                                      info);
+                               unregister_framebuffer(&l_fb_info->gen.info);
                        }
                }
        }
-       return;
 }
 #endif /* MODULE */