hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/video/fbdev/pm3fb.c
....@@ -44,7 +44,7 @@
4444 #define DPRINTK(a, b...) \
4545 printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b)
4646 #else
47
-#define DPRINTK(a, b...)
47
+#define DPRINTK(a, b...) no_printk(a, ##b)
4848 #endif
4949
5050 #define PM3_PIXMAP_SIZE (2048 * 4)
....@@ -306,7 +306,7 @@
306306 PM3PixelSize_GLOBAL_32BIT);
307307 break;
308308 default:
309
- DPRINTK(1, "Unsupported depth %d\n",
309
+ DPRINTK("Unsupported depth %d\n",
310310 info->var.bits_per_pixel);
311311 break;
312312 }
....@@ -349,8 +349,8 @@
349349 (1 << 10) | (0 << 3));
350350 break;
351351 default:
352
- DPRINTK(1, "Unsupported depth %d\n",
353
- info->current_par->depth);
352
+ DPRINTK("Unsupported depth %d\n",
353
+ info->var.bits_per_pixel);
354354 break;
355355 }
356356 }
....@@ -821,9 +821,9 @@
821821
822822 wmb();
823823 {
824
- unsigned char uninitialized_var(m); /* ClkPreScale */
825
- unsigned char uninitialized_var(n); /* ClkFeedBackScale */
826
- unsigned char uninitialized_var(p); /* ClkPostScale */
824
+ unsigned char m; /* ClkPreScale */
825
+ unsigned char n; /* ClkFeedBackScale */
826
+ unsigned char p; /* ClkPostScale */
827827 unsigned long pixclock = PICOS2KHZ(info->var.pixclock);
828828
829829 (void)pm3fb_calculate_clock(pixclock, &m, &n, &p);
....@@ -1200,7 +1200,7 @@
12001200 * Frame buffer operations
12011201 */
12021202
1203
-static struct fb_ops pm3fb_ops = {
1203
+static const struct fb_ops pm3fb_ops = {
12041204 .owner = THIS_MODULE,
12051205 .fb_check_var = pm3fb_check_var,
12061206 .fb_set_par = pm3fb_set_par,
....@@ -1236,7 +1236,7 @@
12361236 return 0;
12371237 }
12381238 screen_mem =
1239
- ioremap_nocache(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
1239
+ ioremap(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
12401240 if (!screen_mem) {
12411241 printk(KERN_WARNING "pm3fb: Can't ioremap smem area.\n");
12421242 release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
....@@ -1347,7 +1347,7 @@
13471347 goto err_exit_neither;
13481348 }
13491349 par->v_regs =
1350
- ioremap_nocache(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);
1350
+ ioremap(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len);
13511351 if (!par->v_regs) {
13521352 printk(KERN_WARNING "pm3fb: Can't remap %s register area.\n",
13531353 pm3fb_fix.id);