Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1045666AbdDWOVx (ORCPT ); Sun, 23 Apr 2017 10:21:53 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36014 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1045620AbdDWOVq (ORCPT ); Sun, 23 Apr 2017 10:21:46 -0400 From: Eric Curtin To: thomas.petazzoni@free-electrons.com, gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Eric Curtin Subject: [PATCH] staging: fbtft: fix character limit, trailing ; warning, etc. Date: Sun, 23 Apr 2017 15:21:31 +0100 Message-Id: <1492957291-24820-1-git-send-email-ericcurtin17@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5559 Lines: 121 checkpatch spits out a warning about the 80 character line limit. Split the parameters of these functions onto different lines. Put the ; with the macro caller instead. Lined up parameters as there was another CHECK warning about that. Signed-off-by: Eric Curtin --- drivers/staging/fbtft/fbtft-bus.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtft-bus.c index ec45043..f1522f4 100644 --- a/drivers/staging/fbtft/fbtft-bus.c +++ b/drivers/staging/fbtft/fbtft-bus.c @@ -24,7 +24,9 @@ void func(struct fbtft_par *par, int len, ...) \ buf[i] = (type)va_arg(args, unsigned int); \ } \ va_end(args); \ - fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device, type, buf, len, "%s: ", __func__); \ + fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, \ + par->info->device, type, buf, len, "%s: ", \ + __func__); \ } \ \ va_start(args, len); \ @@ -41,7 +43,9 @@ void func(struct fbtft_par *par, int len, ...) \ ret = par->fbtftops.write(par, par->buf, sizeof(type) + offset); \ if (ret < 0) { \ va_end(args); \ - dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret); \ + dev_err(par->info->device, \ + "%s: write() failed and returned %d\n", __func__, \ + ret); \ return; \ } \ len--; \ @@ -60,17 +64,19 @@ void func(struct fbtft_par *par, int len, ...) \ len * (sizeof(type) + offset)); \ if (ret < 0) { \ va_end(args); \ - dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret); \ + dev_err(par->info->device, \ + "%s: write() failed and returned %d\n", \ + __func__, ret); \ return; \ } \ } \ va_end(args); \ } \ -EXPORT_SYMBOL(func); +EXPORT_SYMBOL(func) -define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, ) -define_fbtft_write_reg(fbtft_write_reg16_bus8, u16, cpu_to_be16) -define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, ) +define_fbtft_write_reg(fbtft_write_reg8_bus8, u8, ); +define_fbtft_write_reg(fbtft_write_reg16_bus8, u16, cpu_to_be16); +define_fbtft_write_reg(fbtft_write_reg16_bus16, u16, ); void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...) { @@ -84,8 +90,8 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...) for (i = 0; i < len; i++) *(((u8 *)buf) + i) = (u8)va_arg(args, unsigned int); va_end(args); - fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, - par->info->device, u8, buf, len, "%s: ", __func__); + fbtft_par_dbg_hex(DEBUG_WRITE_REGISTER, par, par->info->device, + u8, buf, len, "%s: ", __func__); } if (len <= 0) return; @@ -135,7 +141,7 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) size_t startbyte_size = 0; fbtft_par_dbg(DEBUG_WRITE_VMEM, par, "%s(offset=%zu, len=%zu)\n", - __func__, offset, len); + __func__, offset, len); remain = len / 2; vmem16 = (u16 *)(par->info->screen_buffer + offset); @@ -159,8 +165,8 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len) while (remain) { to_copy = min(tx_array_size, remain); - dev_dbg(par->info->device, " to_copy=%zu, remain=%zu\n", - to_copy, remain - to_copy); + dev_dbg(par->info->device, "to_copy=%zu, remain=%zu\n", to_copy, + remain - to_copy); for (i = 0; i < to_copy; i++) txbuf16[i] = cpu_to_be16(vmem16[i]); @@ -189,7 +195,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) int ret = 0; fbtft_par_dbg(DEBUG_WRITE_VMEM, par, "%s(offset=%zu, len=%zu)\n", - __func__, offset, len); + __func__, offset, len); if (!par->txbuf.buf) { dev_err(par->info->device, "%s: txbuf.buf is NULL\n", __func__); @@ -204,7 +210,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len) while (remain) { to_copy = min(tx_array_size, remain); dev_dbg(par->info->device, " to_copy=%zu, remain=%zu\n", - to_copy, remain - to_copy); + to_copy, remain - to_copy); #ifdef __LITTLE_ENDIAN for (i = 0; i < to_copy; i += 2) { @@ -239,7 +245,7 @@ int fbtft_write_vmem16_bus16(struct fbtft_par *par, size_t offset, size_t len) u16 *vmem16; fbtft_par_dbg(DEBUG_WRITE_VMEM, par, "%s(offset=%zu, len=%zu)\n", - __func__, offset, len); + __func__, offset, len); vmem16 = (u16 *)(par->info->screen_buffer + offset); -- 2.7.4