debug lk

hc

2024-02-20 e636c8d336489bf3eed5878299e6cc045bbad077

 kernel/drivers/video/fbdev/chipsfb.c
..
..
@@ -27,7 +27,6 @@
27
27
 #include <linux/init.h>
28
28
 #include <linux/pci.h>
29
29
 #include <linux/console.h>
30
-#include <asm/io.h>
31
30
 
32
31
 #ifdef CONFIG_PMAC_BACKLIGHT
33
32
 #include <asm/backlight.h>
..
..
@@ -80,7 +79,7 @@
80
79
 			     u_int transp, struct fb_info *info);
81
80
 static int chipsfb_blank(int blank, struct fb_info *info);
82
81
 
83
-static struct fb_ops chipsfb_ops = {
82
+static const struct fb_ops chipsfb_ops = {
84
83
 	.owner		= THIS_MODULE,
85
84
 	.fb_check_var	= chipsfb_check_var,
86
85
 	.fb_set_par	= chipsfb_set_par,
..
..
@@ -367,7 +366,6 @@
367
366
 
368
367
 	p = framebuffer_alloc(0, &dp->dev);
369
368
 	if (p == NULL) {
370
-		dev_err(&dp->dev, "Cannot allocate framebuffer structure\n");
371
369
 		rc = -ENOMEM;
372
370
 		goto err_disable;
373
371
 	}
..
..
@@ -400,7 +398,7 @@
400
398
 #endif /* CONFIG_PMAC_BACKLIGHT */
401
399
 
402
400
 #ifdef CONFIG_PPC
403
-	p->screen_base = __ioremap(addr, 0x200000, _PAGE_NO_CACHE);
401
+	p->screen_base = ioremap_wc(addr, 0x200000);
404
402
 #else
405
403
 	p->screen_base = ioremap(addr, 0x200000);
406
404
 #endif
..
..
@@ -432,6 +430,7 @@
432
430
  err_release_fb:
433
431
 	framebuffer_release(p);
434
432
  err_disable:
433
+	pci_disable_device(dp);
435
434
  err_out:
436
435
 	return rc;
437
436
 }