From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932551AbdJ3Lkp (ORCPT ); Mon, 30 Oct 2017 07:40:45 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:46235 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932515AbdJ3Lkk (ORCPT ); Mon, 30 Oct 2017 07:40:40 -0400 X-Google-Smtp-Source: ABhQp+Q9CfjfY6gOdttDUIDL8hX6sGhV85mMSM/CB8kfn95BNEvrzSIqKokHyWTq/Vqkrcxw4guIQGyldo4ENUHe1o4= MIME-Version: 1.0 In-Reply-To: <7b418db1-ec35-4c85-5d06-45edde56822c@users.sourceforge.net> References: <7b418db1-ec35-4c85-5d06-45edde56822c@users.sourceforge.net> From: Ulf Hansson Date: Mon, 30 Oct 2017 12:40:39 +0100 Message-ID: Subject: Re: [PATCH] mmc: vub300: Use common code in __download_offload_pseudocode() To: SF Markus Elfring Cc: "linux-mmc@vger.kernel.org" , Linux USB List , Tony Olech , LKML , kernel-janitors@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 27 October 2017 at 21:31, SF Markus Elfring wrote: > 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 Thanks, applied for next! Kind regards Uffe > --- > 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 >