tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drivers/video/fbdev: Fixing coding guidelines in acornfb.c

Fixing coding guidelines error reported by 'checkpatch.pl'

Signed-off-by: Pushkar Jambhlekar <pushkar.iit@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

authored by

Pushkar Jambhlekar and committed by
Bartlomiej Zolnierkiewicz 0cb51f65 5a93db42

+5 -7
+5 -7
drivers/video/fbdev/acornfb.c
··· 101 101 #ifdef HAS_VIDC20 102 102 #include <mach/acornfb.h> 103 103 104 - #define MAX_SIZE 2*1024*1024 104 + #define MAX_SIZE (2*1024*1024) 105 105 106 106 /* VIDC20 has a different set of rules from the VIDC: 107 107 * hcr : must be multiple of 4 ··· 162 162 if (memcmp(&current_vidc, &vidc, sizeof(vidc))) { 163 163 current_vidc = vidc; 164 164 165 - vidc_writel(VIDC20_CTRL| vidc.control); 165 + vidc_writel(VIDC20_CTRL | vidc.control); 166 166 vidc_writel(0xd0000000 | vidc.pll_ctl); 167 167 vidc_writel(0x80000000 | vidc.h_cycle); 168 168 vidc_writel(0x81000000 | vidc.h_sync_width); ··· 297 297 pal.p = 0; 298 298 vidc_writel(0x10000000); 299 299 for (i = 0; i < 256; i += 1) { 300 - pal.vidc20.red = current_par.palette[ i & 31].vidc20.red; 300 + pal.vidc20.red = current_par.palette[i & 31].vidc20.red; 301 301 pal.vidc20.green = current_par.palette[(i >> 1) & 31].vidc20.green; 302 302 pal.vidc20.blue = current_par.palette[(i >> 2) & 31].vidc20.blue; 303 303 vidc_writel(pal.p); ··· 1043 1043 base = dma_alloc_wc(current_par.dev, size, &handle, 1044 1044 GFP_KERNEL); 1045 1045 if (base == NULL) { 1046 - printk(KERN_ERR "acornfb: unable to allocate screen " 1047 - "memory\n"); 1046 + printk(KERN_ERR "acornfb: unable to allocate screen memory\n"); 1048 1047 return -ENOMEM; 1049 1048 } 1050 1049 ··· 1102 1103 v_sync = h_sync / (fb_info.var.yres + fb_info.var.upper_margin + 1103 1104 fb_info.var.lower_margin + fb_info.var.vsync_len); 1104 1105 1105 - printk(KERN_INFO "Acornfb: %dkB %cRAM, %s, using %dx%d, " 1106 - "%d.%03dkHz, %dHz\n", 1106 + printk(KERN_INFO "Acornfb: %dkB %cRAM, %s, using %dx%d, %d.%03dkHz, %dHz\n", 1107 1107 fb_info.fix.smem_len / 1024, 1108 1108 current_par.using_vram ? 'V' : 'D', 1109 1109 VIDC_NAME, fb_info.var.xres, fb_info.var.yres,