From 47f7687efaf3873fe8c0e47653515e9ada1b86da Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Fri, 25 Jan 2019 17:32:54 +0000 Subject: [PATCH 331/806] video: bcm2708_fb: Clean up coding style issues Now checkpatch clean except for 2 long lines, missing SPDX header, and no DT documentation. Signed-off-by: Dave Stevenson --- drivers/video/fbdev/bcm2708_fb.c | 96 ++++++++++++++------------------ 1 file changed, 42 insertions(+), 54 deletions(-) --- a/drivers/video/fbdev/bcm2708_fb.c +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -41,7 +41,7 @@ #define MODULE_NAME "bcm2708_fb" #ifdef BCM2708_FB_DEBUG -#define print_debug(fmt, ...) pr_debug("%s:%s:%d: "fmt, \ +#define print_debug(fmt, ...) pr_debug("%s:%s:%d: " fmt, \ MODULE_NAME, __func__, __LINE__, ##__VA_ARGS__) #else #define print_debug(fmt, ...) @@ -57,7 +57,7 @@ static int fbheight = 480; /* module par static int fbdepth = 32; /* module parameter */ static int fbswap; /* module parameter */ -static u32 dma_busy_wait_threshold = 1<<15; +static u32 dma_busy_wait_threshold = 1 << 15; module_param(dma_busy_wait_threshold, int, 0644); MODULE_PARM_DESC(dma_busy_wait_threshold, "Busy-wait for DMA completion below this area"); @@ -132,8 +132,8 @@ static int bcm2708_fb_debugfs_init(struc fb->stats.regset.nregs = ARRAY_SIZE(stats_registers); fb->stats.regset.base = &fb->stats; - if (!debugfs_create_regset32( - "stats", 0444, fb->debugfs_dir, &fb->stats.regset)) { + if (!debugfs_create_regset32("stats", 0444, fb->debugfs_dir, + &fb->stats.regset)) { pr_warn("%s: could not create statistics registers\n", __func__); goto fail; @@ -223,25 +223,22 @@ static int bcm2708_fb_check_var(struct f { /* info input, var output */ print_debug("%s(%p) %dx%d (%dx%d), %d, %d\n", - __func__, - info, - info->var.xres, info->var.yres, info->var.xres_virtual, - info->var.yres_virtual, (int)info->screen_size, - info->var.bits_per_pixel); - print_debug("%s(%p) %dx%d (%dx%d), %d\n", __func__, var, - var->xres, var->yres, var->xres_virtual, var->yres_virtual, - var->bits_per_pixel); + __func__, info, info->var.xres, info->var.yres, + info->var.xres_virtual, info->var.yres_virtual, + (int)info->screen_size, info->var.bits_per_pixel); + print_debug("%s(%p) %dx%d (%dx%d), %d\n", __func__, var, var->xres, + var->yres, var->xres_virtual, var->yres_virtual, + var->bits_per_pixel); if (!var->bits_per_pixel) var->bits_per_pixel = 16; if (bcm2708_fb_set_bitfields(var) != 0) { pr_err("%s: invalid bits_per_pixel %d\n", __func__, - var->bits_per_pixel); + var->bits_per_pixel); return -EINVAL; } - if (var->xres_virtual < var->xres) var->xres_virtual = var->xres; /* use highest possible virtual resolution */ @@ -249,7 +246,7 @@ static int bcm2708_fb_check_var(struct f var->yres_virtual = 480; pr_err("%s: virtual resolution set to maximum of %dx%d\n", - __func__, var->xres_virtual, var->yres_virtual); + __func__, var->xres_virtual, var->yres_virtual); } if (var->yres_virtual < var->yres) var->yres_virtual = var->yres; @@ -294,9 +291,9 @@ static int bcm2708_fb_set_par(struct fb_ int ret; print_debug("%s(%p) %dx%d (%dx%d), %d, %d\n", __func__, info, - info->var.xres, info->var.yres, info->var.xres_virtual, - info->var.yres_virtual, (int)info->screen_size, - info->var.bits_per_pixel); + info->var.xres, info->var.yres, info->var.xres_virtual, + info->var.yres_virtual, (int)info->screen_size, + info->var.bits_per_pixel); ret = rpi_firmware_property_list(fb->fw, &fbinfo, sizeof(fbinfo)); if (ret) { @@ -328,12 +325,10 @@ static int bcm2708_fb_set_par(struct fb_ return -ENOMEM; } - print_debug( - "%s: start = %p,%p width=%d, height=%d, bpp=%d, pitch=%d size=%d\n", - __func__, - (void *)fb->fb.screen_base, (void *)fb->fb_bus_address, - fbinfo.xres, fbinfo.yres, fbinfo.bpp, - fbinfo.pitch, (int)fb->fb.screen_size); + print_debug("%s: start = %p,%p width=%d, height=%d, bpp=%d, pitch=%d size=%d\n", + __func__, (void *)fb->fb.screen_base, + (void *)fb->fb_bus_address, fbinfo.xres, fbinfo.yres, + fbinfo.bpp, fbinfo.pitch, (int)fb->fb.screen_size); return 0; } @@ -345,7 +340,6 @@ static inline u32 convert_bitfield(int v return (val >> (16 - bf->length) & mask) << bf->offset; } - static int bcm2708_fb_setcolreg(unsigned int regno, unsigned int red, unsigned int green, unsigned int blue, unsigned int transp, struct fb_info *info) @@ -379,11 +373,11 @@ static int bcm2708_fb_setcolreg(unsigned packet->offset = 0; packet->length = regno + 1; memcpy(packet->cmap, fb->gpu_cmap, - sizeof(packet->cmap)); + sizeof(packet->cmap)); ret = rpi_firmware_property(fb->fw, - RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE, - packet, - (2 + packet->length) * sizeof(u32)); + RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE, + packet, + (2 + packet->length) * sizeof(u32)); if (ret || packet->offset) dev_err(info->device, "Failed to set palette (%d,%u)\n", @@ -392,9 +386,9 @@ static int bcm2708_fb_setcolreg(unsigned } } else if (regno < 16) { fb->cmap[regno] = convert_bitfield(transp, &fb->fb.var.transp) | - convert_bitfield(blue, &fb->fb.var.blue) | - convert_bitfield(green, &fb->fb.var.green) | - convert_bitfield(red, &fb->fb.var.red); + convert_bitfield(blue, &fb->fb.var.blue) | + convert_bitfield(green, &fb->fb.var.green) | + convert_bitfield(red, &fb->fb.var.red); } return regno > 255; } @@ -437,8 +431,8 @@ static int bcm2708_fb_pan_display(struct info->var.yoffset = var->yoffset; result = bcm2708_fb_set_par(info); if (result != 0) - pr_err("%s(%d,%d) returns=%d\n", __func__, - var->xoffset, var->yoffset, result); + pr_err("%s(%d,%d) returns=%d\n", __func__, var->xoffset, + var->yoffset, result); return result; } @@ -468,9 +462,8 @@ static void dma_memcpy(struct bcm2708_fb cb->info |= BCM2708_DMA_INT_EN; bcm_dma_start(fb->dma_chan_base, fb->cb_handle); while (bcm_dma_is_busy(dma_chan)) { - wait_event_interruptible( - fb->dma_waitq, - !bcm_dma_is_busy(dma_chan)); + wait_event_interruptible(fb->dma_waitq, + !bcm_dma_is_busy(dma_chan)); } fb->stats.dma_irqs++; } @@ -478,9 +471,9 @@ static void dma_memcpy(struct bcm2708_fb } /* address with no aliases */ -#define INTALIAS_NORMAL(x) ((x)&~0xc0000000) +#define INTALIAS_NORMAL(x) ((x) & ~0xc0000000) /* cache coherent but non-allocating in L1 and L2 */ -#define INTALIAS_L1L2_NONALLOCATING(x) (((x)&~0xc0000000)|0x80000000) +#define INTALIAS_L1L2_NONALLOCATING(x) (((x) & ~0xc0000000) | 0x80000000) static long vc_mem_copy(struct bcm2708_fb *fb, struct fb_dmacopy *ioparam) { @@ -498,15 +491,15 @@ static long vc_mem_copy(struct bcm2708_f if (!fb->gpu.base || !fb->gpu.length) { pr_err("[%s]: Unable to determine gpu memory (%x,%x)\n", - __func__, fb->gpu.base, fb->gpu.length); + __func__, fb->gpu.base, fb->gpu.length); return -EFAULT; } if (INTALIAS_NORMAL(ioparam->src) < fb->gpu.base || INTALIAS_NORMAL(ioparam->src) >= fb->gpu.base + fb->gpu.length) { pr_err("[%s]: Invalid memory access %x (%x-%x)", __func__, - INTALIAS_NORMAL(ioparam->src), fb->gpu.base, - fb->gpu.base + fb->gpu.length); + INTALIAS_NORMAL(ioparam->src), fb->gpu.base, + fb->gpu.base + fb->gpu.length); return -EFAULT; } @@ -528,8 +521,7 @@ static long vc_mem_copy(struct bcm2708_f dma_memcpy(fb, bus_addr, INTALIAS_L1L2_NONALLOCATING((dma_addr_t)p), size); if (copy_to_user(q, buf, s) != 0) { - pr_err("[%s]: failed to copy-to-user\n", - __func__); + pr_err("[%s]: failed to copy-to-user\n", __func__); rc = -EFAULT; goto out; } @@ -755,7 +747,6 @@ static void bcm2708_fb_copyarea(struct f /* end of dma control blocks chain */ cb->next = 0; - if (pixels < dma_busy_wait_threshold) { bcm_dma_start(fb->dma_chan_base, fb->cb_handle); bcm_dma_wait_idle(fb->dma_chan_base); @@ -765,9 +756,8 @@ static void bcm2708_fb_copyarea(struct f cb->info |= BCM2708_DMA_INT_EN; bcm_dma_start(fb->dma_chan_base, fb->cb_handle); while (bcm_dma_is_busy(dma_chan)) { - wait_event_interruptible( - fb->dma_waitq, - !bcm_dma_is_busy(dma_chan)); + wait_event_interruptible(fb->dma_waitq, + !bcm_dma_is_busy(dma_chan)); } fb->stats.dma_irqs++; } @@ -863,7 +853,7 @@ static int bcm2708_fb_register(struct bc return ret; print_debug("BCM2708FB: registering framebuffer (%dx%d@%d) (%d)\n", - fbwidth, fbheight, fbdepth, fbswap); + fbwidth, fbheight, fbdepth, fbswap); ret = register_framebuffer(&fb->fb); print_debug("BCM2708FB: register framebuffer (%d)\n", ret); @@ -893,7 +883,7 @@ static int bcm2708_fb_probe(struct platf if (!fw) return -EPROBE_DEFER; - fb = kzalloc(sizeof(struct bcm2708_fb), GFP_KERNEL); + fb = kzalloc(sizeof(*fb), GFP_KERNEL); if (!fb) { ret = -ENOMEM; goto free_region; @@ -927,7 +917,6 @@ static int bcm2708_fb_probe(struct platf goto free_dma_chan; } - pr_info("BCM2708FB: allocated DMA channel %d\n", fb->dma_chan); fb->dev = dev; @@ -936,9 +925,8 @@ static int bcm2708_fb_probe(struct platf /* failure here isn't fatal, but we'll fail in vc_mem_copy if * fb->gpu is not valid */ - rpi_firmware_property(fb->fw, - RPI_FIRMWARE_GET_VC_MEMORY, - &fb->gpu, sizeof(fb->gpu)); + rpi_firmware_property(fb->fw, RPI_FIRMWARE_GET_VC_MEMORY, &fb->gpu, + sizeof(fb->gpu)); ret = bcm2708_fb_register(fb); if (ret == 0) {