[PATCH] chipsfb: New framebuffer_alloc API and class_dev changes

@@ -42,7 +42,7 @@
  * Since we access the display with inb/outb to fixed port numbers,
  * we can only handle one 6555x chip.  -- paulus
  */
-static struct fb_info chipsfb_info;
+static struct fb_info *chipsfb_info;
 
 #define write_ind(num, val, ap, dp)	do { \
 	outb((num), (ap)); outb((val), (dp)); \

@@ -95,6 +95,8 @@
 			     u_int transp, struct fb_info *info);
 static int chipsfb_blank(int blank, struct fb_info *info);
 
+static void release_chipsfb(struct fb_info *p);
+
 static struct fb_ops chipsfb_ops = {
 	.owner		= THIS_MODULE,
 	.fb_check_var	= chipsfb_check_var,

@@ -354,7 +356,7 @@
 	.vsync_len = 8,
 };
 
-static void __init init_chips(struct fb_info *p, unsigned long addr)
+static int __init init_chips(struct fb_info *p, unsigned long addr)
 {
 	p->fix = chipsfb_fix;
 	p->fix.smem_start = addr;

@@ -366,21 +368,24 @@
 
 	fb_alloc_cmap(&p->cmap, 256, 0);
 
+	chipsfb_info = p;
 	if (register_framebuffer(p) < 0) {
 		printk(KERN_ERR "C&T 65550 framebuffer failed to register\n");
-		return;
+		return -1;
 	}
 
 	printk(KERN_INFO "fb%d: Chips 65550 frame buffer (%dK RAM detected)\n",
 		p->node, p->fix.smem_len / 1024);
 
 	chips_hw_init();
+
+	return 0;
 }
 
 static int __devinit
 chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
 {
-	struct fb_info *p = &chipsfb_info;
+	struct fb_info *p;
 	unsigned long addr, size;
 	unsigned short cmd;
 

@@ -390,11 +395,14 @@
 	size = pci_resource_len(dp, 0);
 	if (addr == 0)
 		return -ENODEV;
-	if (p->screen_base != 0)
-		return -EBUSY;
 	if (!request_mem_region(addr, size, "chipsfb"))
 		return -EBUSY;
 
+	p = framebuffer_alloc(0, &dp->dev);
+	if (!p)
+		return -ENOMEM;
+	p->release = &release_chipsfb;
+
 #ifdef __BIG_ENDIAN
 	addr += 0x800000;	// Use big-endian aperture
 #endif

@@ -413,11 +421,18 @@
 
 	p->screen_base = __ioremap(addr, 0x200000, _PAGE_NO_CACHE);
 	if (p->screen_base == NULL) {
+		kfree(p);
 		release_mem_region(addr, size);
 		return -ENOMEM;
 	}
 
-	init_chips(p, addr);
+	if (init_chips(p, addr)) {
+		iounmap(p->screen_base);
+		release_mem_region(addr, size);
+		kfree(p);
+
+		return -ENODEV;
+	}
 
 #ifdef CONFIG_PMAC_PBOOK
 	pmu_register_sleep_notifier(&chips_sleep_notifier);

@@ -430,20 +445,28 @@
 	return 0;
 }
 
+static void release_chipsfb(struct fb_info *p)
+{
+	struct pci_dev *dp = to_pci_dev(p->class_dev.dev);
+	
+#ifdef CONFIG_PMAC_PBOOK
+	pmu_unregister_sleep_notifier(&chips_sleep_notifier);
+#endif /* CONFIG_PMAC_PBOOK */
+
+	chipsfb_info = NULL;
+	iounmap(p->screen_base);
+	release_mem_region(pci_resource_start(dp, 0), pci_resource_len(dp, 0));
+}
+
 static void __devexit chipsfb_remove(struct pci_dev *dp)
 {
 	struct fb_info *p = pci_get_drvdata(dp);
 
-	if (p != &chipsfb_info || p->screen_base == NULL)
+	if (p != chipsfb_info || p->screen_base == NULL)
 		return;
 	unregister_framebuffer(p);
-	iounmap(p->screen_base);
-	p->screen_base = NULL;
-	release_mem_region(pci_resource_start(dp, 0), pci_resource_len(dp, 0));
 
-#ifdef CONFIG_PMAC_PBOOK
-	pmu_unregister_sleep_notifier(&chips_sleep_notifier);
-#endif /* CONFIG_PMAC_PBOOK */
+	pci_set_drvdata(dp, NULL);
 }
 
 static struct pci_device_id chipsfb_pci_tbl[] = {