afs: remove smp_prcessor_id() from debug macro

[sfrench/cifs-2.6.git] / drivers / video / p9100.c

diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 56ac51d6a7f3f0380b0a76dc7f86ed28948cf8b3..58496061142de6e90d2a27e79381ac55d1d0b29f 100644 (file)
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -255,104 +255,97 @@ static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_no
        info->fix.accel = FB_ACCEL_SUN_CGTHREE;
 }
 
-struct all_info {
-       struct fb_info info;
-       struct p9100_par par;
-};
-
-static int __devinit p9100_init_one(struct of_device *op)
+static int __devinit p9100_probe(struct of_device *op, const struct of_device_id *match)
 {
        struct device_node *dp = op->node;
-       struct all_info *all;
+       struct fb_info *info;
+       struct p9100_par *par;
        int linebytes, err;
 
-       all = kzalloc(sizeof(*all), GFP_KERNEL);
-       if (!all)
-               return -ENOMEM;
+       info = framebuffer_alloc(sizeof(struct p9100_par), &op->dev);
 
-       spin_lock_init(&all->par.lock);
+       err = -ENOMEM;
+       if (!info)
+               goto out_err;
+       par = info->par;
+
+       spin_lock_init(&par->lock);
 
        /* This is the framebuffer and the only resource apps can mmap.  */
-       all->par.physbase = op->resource[2].start;
-       all->par.which_io = op->resource[2].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;
-
-       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], 0,
-                                  sizeof(struct p9100_regs), "p9100 regs");
-       if (!all->par.regs) {
-               kfree(all);
-               return -ENOMEM;
-       }
+       par->physbase = op->resource[2].start;
+       par->which_io = op->resource[2].flags & IORESOURCE_BITS;
 
-       all->info.flags = FBINFO_DEFAULT;
-       all->info.fbops = &p9100_ops;
-       all->info.screen_base = of_ioremap(&op->resource[2], 0,
-                                          all->par.fbsize, "p9100 ram");
-       if (!all->info.screen_base) {
-               of_iounmap(all->par.regs, sizeof(struct p9100_regs));
-               kfree(all);
-               return -ENOMEM;
-       }
-       all->info.par = &all->par;
+       sbusfb_fill_var(&info->var, dp->node, 8);
+       info->var.red.length = 8;
+       info->var.green.length = 8;
+       info->var.blue.length = 8;
 
-       p9100_blank(0, &all->info);
+       linebytes = of_getintprop_default(dp, "linebytes", info->var.xres);
+       par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
 
-       if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
-               of_iounmap(all->par.regs, sizeof(struct p9100_regs));
-               of_iounmap(all->info.screen_base, all->par.fbsize);
-               kfree(all);
-               return -ENOMEM;
-       }
+       par->regs = of_ioremap(&op->resource[0], 0,
+                              sizeof(struct p9100_regs), "p9100 regs");
+       if (!par->regs)
+               goto out_release_fb;
 
-       p9100_init_fix(&all->info, linebytes, dp);
+       info->flags = FBINFO_DEFAULT;
+       info->fbops = &p9100_ops;
+       info->screen_base = of_ioremap(&op->resource[2], 0,
+                                      par->fbsize, "p9100 ram");
+       if (!info->screen_base)
+               goto out_unmap_regs;
 
-       err = register_framebuffer(&all->info);
-       if (err < 0) {
-               fb_dealloc_cmap(&all->info.cmap);
-               of_iounmap(all->par.regs, sizeof(struct p9100_regs));
-               of_iounmap(all->info.screen_base, all->par.fbsize);
-               kfree(all);
-               return err;
-       }
-       fb_set_cmap(&all->info.cmap, &all->info);
+       p9100_blank(0, info);
+
+       if (fb_alloc_cmap(&info->cmap, 256, 0))
+               goto out_unmap_screen;
 
-       dev_set_drvdata(&op->dev, all);
+       p9100_init_fix(info, linebytes, dp);
+
+       err = register_framebuffer(info);
+       if (err < 0)
+               goto out_dealloc_cmap;
+
+       fb_set_cmap(&info->cmap, info);
+
+       dev_set_drvdata(&op->dev, info);
 
        printk("%s: p9100 at %lx:%lx\n",
               dp->full_name,
-              all->par.which_io, all->par.physbase);
+              par->which_io, par->physbase);
 
        return 0;
-}
 
-static int __devinit p9100_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[2], info->screen_base, par->fbsize);
+
+out_unmap_regs:
+       of_iounmap(&op->resource[0], par->regs, sizeof(struct p9100_regs));
+
+out_release_fb:
+       framebuffer_release(info);
 
-       return p9100_init_one(op);
+out_err:
+       return err;
 }
 
-static int __devexit p9100_remove(struct of_device *dev)
+static int __devexit p9100_remove(struct of_device *op)
 {
-       struct all_info *all = dev_get_drvdata(&dev->dev);
+       struct fb_info *info = dev_get_drvdata(&op->dev);
+       struct p9100_par *par = info->par;
 
-       unregister_framebuffer(&all->info);
-       fb_dealloc_cmap(&all->info.cmap);
+       unregister_framebuffer(info);
+       fb_dealloc_cmap(&info->cmap);
 
-       of_iounmap(all->par.regs, sizeof(struct p9100_regs));
-       of_iounmap(all->info.screen_base, all->par.fbsize);
+       of_iounmap(&op->resource[0], par->regs, sizeof(struct p9100_regs));
+       of_iounmap(&op->resource[2], info->screen_base, par->fbsize);
 
-       kfree(all);
+       framebuffer_release(info);
 
-       dev_set_drvdata(&dev->dev, NULL);
+       dev_set_drvdata(&op->dev, NULL);
 
        return 0;
 }