From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932444AbdJ0Tb4 (ORCPT ); Fri, 27 Oct 2017 15:31:56 -0400 Received: from mout.web.de ([212.227.17.11]:58253 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932401AbdJ0Tbx (ORCPT ); Fri, 27 Oct 2017 15:31:53 -0400 To: linux-mmc@vger.kernel.org, linux-usb@vger.kernel.org, Tony Olech , Ulf Hansson Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] mmc: vub300: Use common code in __download_offload_pseudocode() Message-ID: <7b418db1-ec35-4c85-5d06-45edde56822c@users.sourceforge.net> Date: Fri, 27 Oct 2017 21:31:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:q2x0E7L7BRot/2EjeFvBrgBnPc/TYTDF+s3LJ5BPGAf9T0sHlJq yKm+YncuJX2hkZuzy8MzsaTgsziu7qqvd+DjyQnXC0zT/YBCPPthHqG4s73pnsivRHBS+3l b4f0vmhhSkh6nGdnkf7Pr4b5zW/AUHaqeFJ8RDwE0alaCYJrZk1SCwjOlIuzQJhPb3/zUPQ jk2jSjzSayfvrRGjLXhWw== X-UI-Out-Filterresults: notjunk:1;V01:K0:YhZIEGkYwMI=:E9YnjFEaRCL6KagAecYeqo tOsdnf4PWcsxSCaptjqekOsD+LEvjP5PcZNM4Y+jQye6GJS7D6nh2LDAjmH5xrsjOT2WmZoAH aHdxQVwXGcVw82ZpOzyVBd4n4kihHcmtAXwZK9rFJuuWjaTTijrK+vrjM16JyUIJn5RfBpNTY tWl656OUgG8hDk6ZJV9YSiuQTZQCg+XetzdzmsB8C58s1ZxzLJAsij7B5tMPeVrfZ12VivHa0 YkBbvo0ND17FXOIcfaPGBPbfRoCIZZ2ZpSkQCD76tJVZbUMPo2qN0A2xbi6yhG/snQDBZZfYM 1uxN2HPQtFxERAXIrufpaGi9tBijERRe+MJEwPC+ytlWS4YOvkk6AGwbehqGkXRxxe8FYIGZw VfK2cpNI1swCFvtBf3zDKgDOeSm5vaZk9ubabt651FZXX4A5Z6u2UxpscC3qu+xb910mpPHt+ fDPuy7whI2EwsG9+16rSTNhYRsdW7KWhr8GQrHphHwHA4OIBYQV9BBgDRG1SqUwWcp9UvXJ3g sm+kz1EYvUPQRYw3WMSY9QmOmO6iTN6ilMbafLJHkGfv9PdQkSz0NOMac82RWsM6IXghxKtaO vi/4h9P9PBndUhWA+cizhj5j0AiljjS8a7ELji4dwegdfiidZu9TRv/Lu7DTNFAaDA1q3UltD UcBUubLSv+MY2DdnSkLPFM/Z7u8plw3amLn17WBF/RA+bGccUxCEO895Onm71aO/6VxCYihk4 XKk7dNXzE64s+oGT3LFr3skaFX4mqA7xbCn8kdB+4AAerIg/vST7LsKskTPdXSgwFaiCjKys9 k+NYNdcGrpNgP4ARV3+Ja5gwjOO2xzHA6rl/g61AlaF3ljJ04M= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 27 Oct 2017 21:21:40 +0200 Add a jump target so that a specific string copy operation is stored only once at the end of this function implementation. Replace two calls of the function "strncpy" by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/mmc/host/vub300.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c index c1a169843f99..c898a45a84c5 100644 --- a/drivers/mmc/host/vub300.c +++ b/drivers/mmc/host/vub300.c @@ -1244,12 +1244,8 @@ static void __download_offload_pseudocode(struct vub300_mmc_host *vub300, USB_RECIP_DEVICE, 0x0000, 0x0000, xfer_buffer, xfer_length, HZ); kfree(xfer_buffer); - if (retval < 0) { - strncpy(vub300->vub_name, - "SDIO pseudocode download failed", - sizeof(vub300->vub_name)); - return; - } + if (retval < 0) + goto copy_error_message; } else { dev_err(&vub300->udev->dev, "not enough memory for xfer buffer to send" @@ -1291,12 +1287,8 @@ static void __download_offload_pseudocode(struct vub300_mmc_host *vub300, USB_RECIP_DEVICE, 0x0000, 0x0000, xfer_buffer, xfer_length, HZ); kfree(xfer_buffer); - if (retval < 0) { - strncpy(vub300->vub_name, - "SDIO pseudocode download failed", - sizeof(vub300->vub_name)); - return; - } + if (retval < 0) + goto copy_error_message; } else { dev_err(&vub300->udev->dev, "not enough memory for xfer buffer to send" @@ -1349,6 +1341,12 @@ static void __download_offload_pseudocode(struct vub300_mmc_host *vub300, sizeof(vub300->vub_name)); return; } + + return; + +copy_error_message: + strncpy(vub300->vub_name, "SDIO pseudocode download failed", + sizeof(vub300->vub_name)); } /* -- 2.14.3