.. | .. |
---|
44 | 44 | #define DPRINTK(a, b...) \ |
---|
45 | 45 | printk(KERN_DEBUG "pm3fb: %s: " a, __func__ , ## b) |
---|
46 | 46 | #else |
---|
47 | | -#define DPRINTK(a, b...) |
---|
| 47 | +#define DPRINTK(a, b...) no_printk(a, ##b) |
---|
48 | 48 | #endif |
---|
49 | 49 | |
---|
50 | 50 | #define PM3_PIXMAP_SIZE (2048 * 4) |
---|
.. | .. |
---|
306 | 306 | PM3PixelSize_GLOBAL_32BIT); |
---|
307 | 307 | break; |
---|
308 | 308 | default: |
---|
309 | | - DPRINTK(1, "Unsupported depth %d\n", |
---|
| 309 | + DPRINTK("Unsupported depth %d\n", |
---|
310 | 310 | info->var.bits_per_pixel); |
---|
311 | 311 | break; |
---|
312 | 312 | } |
---|
.. | .. |
---|
349 | 349 | (1 << 10) | (0 << 3)); |
---|
350 | 350 | break; |
---|
351 | 351 | 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); |
---|
354 | 354 | break; |
---|
355 | 355 | } |
---|
356 | 356 | } |
---|
.. | .. |
---|
821 | 821 | |
---|
822 | 822 | wmb(); |
---|
823 | 823 | { |
---|
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 */ |
---|
827 | 827 | unsigned long pixclock = PICOS2KHZ(info->var.pixclock); |
---|
828 | 828 | |
---|
829 | 829 | (void)pm3fb_calculate_clock(pixclock, &m, &n, &p); |
---|
.. | .. |
---|
1200 | 1200 | * Frame buffer operations |
---|
1201 | 1201 | */ |
---|
1202 | 1202 | |
---|
1203 | | -static struct fb_ops pm3fb_ops = { |
---|
| 1203 | +static const struct fb_ops pm3fb_ops = { |
---|
1204 | 1204 | .owner = THIS_MODULE, |
---|
1205 | 1205 | .fb_check_var = pm3fb_check_var, |
---|
1206 | 1206 | .fb_set_par = pm3fb_set_par, |
---|
.. | .. |
---|
1236 | 1236 | return 0; |
---|
1237 | 1237 | } |
---|
1238 | 1238 | screen_mem = |
---|
1239 | | - ioremap_nocache(pm3fb_fix.smem_start, pm3fb_fix.smem_len); |
---|
| 1239 | + ioremap(pm3fb_fix.smem_start, pm3fb_fix.smem_len); |
---|
1240 | 1240 | if (!screen_mem) { |
---|
1241 | 1241 | printk(KERN_WARNING "pm3fb: Can't ioremap smem area.\n"); |
---|
1242 | 1242 | release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len); |
---|
.. | .. |
---|
1347 | 1347 | goto err_exit_neither; |
---|
1348 | 1348 | } |
---|
1349 | 1349 | par->v_regs = |
---|
1350 | | - ioremap_nocache(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len); |
---|
| 1350 | + ioremap(pm3fb_fix.mmio_start, pm3fb_fix.mmio_len); |
---|
1351 | 1351 | if (!par->v_regs) { |
---|
1352 | 1352 | printk(KERN_WARNING "pm3fb: Can't remap %s register area.\n", |
---|
1353 | 1353 | pm3fb_fix.id); |
---|