Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux.git] / drivers / video / cg3.c

diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index f042428a84f4485214a5ca1d95c38001bf0d9e8a..a5c7fb331527c03038d7b42d73830de306fbab4f 100644 (file)
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -315,7 +315,7 @@ static u_char cg3_dacvals[] __devinitdata = {
        4, 0xff,        5, 0x00,        6, 0x70,        7, 0x00,        0
 };
 
        4, 0xff,        5, 0x00,        6, 0x70,        7, 0x00,        0
 };
 

-static void __devinit cg3_do_default_mode(struct cg3_par *par)
+static int __devinit cg3_do_default_mode(struct cg3_par *par)

 {
        enum cg3_type type;
        u8 *p;
 {
        enum cg3_type type;
        u8 *p;


@@ -332,10 +332,9 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                        else
                                type = CG3_AT_66HZ;
                } else {
                        else
                                type = CG3_AT_66HZ;
                } else {

-                       prom_printf("cgthree: can't handle SR %02x\n",
-                                   status);
-                       prom_halt();
-                       return;
+                       printk(KERN_ERR "cgthree: can't handle SR %02x\n",
+                              status);
+                       return -EINVAL;

                }
        }
 
                }
        }
 


@@ -351,106 +350,108 @@ static void __devinit cg3_do_default_mode(struct cg3_par *par)
                regp = (u8 __iomem *)&par->regs->cmap.control;
                sbus_writeb(p[1], regp);
        }
                regp = (u8 __iomem *)&par->regs->cmap.control;
                sbus_writeb(p[1], regp);
        }

+       return 0;

 }
 
 }
 

-struct all_info {
-       struct fb_info info;
-       struct cg3_par par;
-};
-
-static int __devinit cg3_init_one(struct of_device *op)
+static int __devinit cg3_probe(struct of_device *op,
+                              const struct of_device_id *match)

 {
        struct device_node *dp = op->node;
 {
        struct device_node *dp = op->node;

-       struct all_info *all;
+       struct fb_info *info;
+       struct cg3_par *par;

        int linebytes, err;
 
        int linebytes, err;
 

-       all = kzalloc(sizeof(*all), GFP_KERNEL);
-       if (!all)
-               return -ENOMEM;
+       info = framebuffer_alloc(sizeof(struct cg3_par), &op->dev);
+
+       err = -ENOMEM;
+       if (!info)
+               goto out_err;
+       par = info->par;

 
 

-       spin_lock_init(&all->par.lock);
+       spin_lock_init(&par->lock);

 
 

-       all->par.physbase = op->resource[0].start;
-       all->par.which_io = op->resource[0].flags & IORESOURCE_BITS;
+       par->physbase = op->resource[0].start;
+       par->which_io = op->resource[0].flags & IORESOURCE_BITS;

 
 

-       sbusfb_fill_var(&all->info.var, dp->node, 8);
-       all->info.var.red.length = 8;
-       all->info.var.green.length = 8;
-       all->info.var.blue.length = 8;
+       sbusfb_fill_var(&info->var, dp->node, 8);
+       info->var.red.length = 8;
+       info->var.green.length = 8;
+       info->var.blue.length = 8;

        if (!strcmp(dp->name, "cgRDI"))
        if (!strcmp(dp->name, "cgRDI"))

-               all->par.flags |= CG3_FLAG_RDI;
-       if (all->par.flags & CG3_FLAG_RDI)
-               cg3_rdi_maybe_fixup_var(&all->info.var, dp);
+               par->flags |= CG3_FLAG_RDI;
+       if (par->flags & CG3_FLAG_RDI)
+               cg3_rdi_maybe_fixup_var(&info->var, dp);

 
        linebytes = of_getintprop_default(dp, "linebytes",
 
        linebytes = of_getintprop_default(dp, "linebytes",

-                                         all->info.var.xres);
-       all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
-
-       all->par.regs = of_ioremap(&op->resource[0], CG3_REGS_OFFSET,
-                                  sizeof(struct cg3_regs), "cg3 regs");
-
-       all->info.flags = FBINFO_DEFAULT;
-       all->info.fbops = &cg3_ops;
-       all->info.screen_base =
-               of_ioremap(&op->resource[0], CG3_RAM_OFFSET,
-                          all->par.fbsize, "cg3 ram");
-       all->info.par = &all->par;
-
-       cg3_blank(0, &all->info);
-
-       if (!of_find_property(dp, "width", NULL))
-               cg3_do_default_mode(&all->par);
-
-       if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
-               of_iounmap(&op->resource[0],
-                          all->par.regs, sizeof(struct cg3_regs));
-               of_iounmap(&op->resource[0],
-                          all->info.screen_base, all->par.fbsize);
-               kfree(all);
-               return -ENOMEM;
-       }
-       fb_set_cmap(&all->info.cmap, &all->info);
-
-       cg3_init_fix(&all->info, linebytes, dp);
-
-       err = register_framebuffer(&all->info);
-       if (err < 0) {
-               fb_dealloc_cmap(&all->info.cmap);
-               of_iounmap(&op->resource[0],
-                          all->par.regs, sizeof(struct cg3_regs));
-               of_iounmap(&op->resource[0],
-                          all->info.screen_base, all->par.fbsize);
-               kfree(all);
-               return err;
+                                         info->var.xres);
+       par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
+
+       par->regs = of_ioremap(&op->resource[0], CG3_REGS_OFFSET,
+                              sizeof(struct cg3_regs), "cg3 regs");
+       if (!par->regs)
+               goto out_release_fb;
+
+       info->flags = FBINFO_DEFAULT;
+       info->fbops = &cg3_ops;
+       info->screen_base = of_ioremap(&op->resource[0], CG3_RAM_OFFSET,
+                                      par->fbsize, "cg3 ram");
+       if (!info->screen_base)
+               goto out_unmap_regs;
+
+       cg3_blank(0, info);
+
+       if (!of_find_property(dp, "width", NULL)) {
+               err = cg3_do_default_mode(par);
+               if (err)
+                       goto out_unmap_screen;

        }
 
        }
 

-       dev_set_drvdata(&op->dev, all);
+       if (fb_alloc_cmap(&info->cmap, 256, 0))
+               goto out_unmap_screen;
+
+       fb_set_cmap(&info->cmap, info);
+
+       cg3_init_fix(info, linebytes, dp);
+
+       err = register_framebuffer(info);
+       if (err < 0)
+               goto out_dealloc_cmap;
+
+       dev_set_drvdata(&op->dev, info);

 
        printk("%s: cg3 at %lx:%lx\n",
 
        printk("%s: cg3 at %lx:%lx\n",

-              dp->full_name, all->par.which_io, all->par.physbase);
+              dp->full_name, par->which_io, par->physbase);

 
        return 0;
 
        return 0;

-}

 
 

-static int __devinit cg3_probe(struct of_device *dev,
-                              const struct of_device_id *match)
-{
-       struct of_device *op = to_of_device(&dev->dev);
+out_dealloc_cmap:
+       fb_dealloc_cmap(&info->cmap);
+
+out_unmap_screen:
+       of_iounmap(&op->resource[0], info->screen_base, par->fbsize);
+
+out_unmap_regs:
+       of_iounmap(&op->resource[0], par->regs, sizeof(struct cg3_regs));
+
+out_release_fb:
+       framebuffer_release(info);

 
 

-       return cg3_init_one(op);
+out_err:
+       return err;

 }
 
 static int __devexit cg3_remove(struct of_device *op)
 {
 }
 
 static int __devexit cg3_remove(struct of_device *op)
 {

-       struct all_info *all = dev_get_drvdata(&op->dev);
+       struct fb_info *info = dev_get_drvdata(&op->dev);
+       struct cg3_par *par = info->par;

 
 

-       unregister_framebuffer(&all->info);
-       fb_dealloc_cmap(&all->info.cmap);
+       unregister_framebuffer(info);
+       fb_dealloc_cmap(&info->cmap);

 
 

-       of_iounmap(&op->resource[0], all->par.regs, sizeof(struct cg3_regs));
-       of_iounmap(&op->resource[0], all->info.screen_base, all->par.fbsize);
+       of_iounmap(&op->resource[0], par->regs, sizeof(struct cg3_regs));
+       of_iounmap(&op->resource[0], info->screen_base, par->fbsize);

 
 

-       kfree(all);
+       framebuffer_release(info);

 
        dev_set_drvdata(&op->dev, NULL);
 
 
        dev_set_drvdata(&op->dev, NULL);