From patchwork Wed Nov 30 20:46:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 701194 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3tTXY15VQhz9t2D for ; Thu, 1 Dec 2016 07:47:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="2G2D0659"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 200B5A75E9; Wed, 30 Nov 2016 21:47:27 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aPZU81QI3eNp; Wed, 30 Nov 2016 21:47:26 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CE777B389C; Wed, 30 Nov 2016 21:47:10 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E372EA75B7 for ; Wed, 30 Nov 2016 21:47:04 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2eK1kLex8Uhf for ; Wed, 30 Nov 2016 21:47:04 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wj0-f196.google.com (mail-wj0-f196.google.com [209.85.210.196]) by theia.denx.de (Postfix) with ESMTPS id 1118CA75C5 for ; Wed, 30 Nov 2016 21:47:01 +0100 (CET) Received: by mail-wj0-f196.google.com with SMTP id kp2so23921849wjc.0 for ; Wed, 30 Nov 2016 12:47:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=6D9LCdMuijL5cZSXBnquPhJsBcgerehtyFMpkfXaMPk=; b=2G2D0659v6/KNuGsNv2rPoEe76EQLnobmPRgIHJ35nno44Q6Ua4nhlKkoeNR0/258x dwGweo8H7u1vutOKAQoyTYGSwSlcrNW00RsF/12L61KcApJqfTrwDtFtkVoagoHXX8tF ylK/j4As+MZZ6mZTllUF2VpjofW4WF9qwARBdfQ+MC5zUCZ/VnLAvZKpvIEYLmjvEXs0 XZi74ChbEgXMEhN7LZPnk845k+YAcfj83AP7fsB+z7ubnRlqHNKq8ee84iG1Fh7uad1r cE9xFvKsONzw2D7JtBKhkMwABSaLVU/VCQQ0qhui7km1yx+7aiR8ll4H3cBySZBuVYd9 uu4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=6D9LCdMuijL5cZSXBnquPhJsBcgerehtyFMpkfXaMPk=; b=eYgT3zn8L5uW8QPNuumO7+u0Fg6eIMy46/HANCpoCMyfLq4ME/b/YAhbnxs/J7FFZZ bcXvWw4cO2EVO+wq8az5jCbk2hZQVFgtTW3Lq9WMFPIm/oFrNkDbEyqSB0f/QHqBGOts u6bQOpNjqxXo0HCjSzS68PqldbKGoKSRUag9vxp+YPHQ2dsLUtt5cUO/CNgpHsGMzlKB pi0grVwQuKzxvKfi3OmUQ3cM9L72lUmU2KXEmlxD7uwdkVJzTdZyf9XJE/FTfEvIN2sv y2UtHguKgjrn7u7Wyx3QZAZ3sbwbvK6rrDGPCQWLWoMUa0Maa77XhEc/vjDJ2vnrUARG 5ICw== X-Gm-Message-State: AKaTC00Tj9j4X5Qzw4SVH9w4pXBe6T3S9gPDAfC7FhnsBD9cqWw5T0o7kfceuTxl5hZHUw== X-Received: by 10.194.220.230 with SMTP id pz6mr30091088wjc.81.1480538820822; Wed, 30 Nov 2016 12:47:00 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id f67sm9723580wmd.13.2016.11.30.12.47.00 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 30 Nov 2016 12:47:00 -0800 (PST) From: Michal Simek To: Simon Glass Date: Wed, 30 Nov 2016 21:46:50 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: <8c42f4113fa6cf67146dcc512e2d7a3f981074cd.1480538807.git.michal.simek@xilinx.com> References: <8c42f4113fa6cf67146dcc512e2d7a3f981074cd.1480538807.git.michal.simek@xilinx.com> In-Reply-To: <8c42f4113fa6cf67146dcc512e2d7a3f981074cd.1480538807.git.michal.simek@xilinx.com> References: <8c42f4113fa6cf67146dcc512e2d7a3f981074cd.1480538807.git.michal.simek@xilinx.com> Cc: Stefan Roese , Stephen Warren , u-boot@lists.denx.de Subject: [U-Boot] [PATCH v1 4/5] scsi: Change scsi_scan() to be able to return value X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" With DM_SCSI this function will return more than one return value to cover errors. Suggested-by: Simon Glass Signed-off-by: Michal Simek Reviewed-by: Tom Rini Reviewed-by: Simon Glass --- cmd/scsi.c | 14 ++++++++++---- common/scsi.c | 3 ++- include/scsi.h | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cmd/scsi.c b/cmd/scsi.c index a9c954a82f3d..4213ec867751 100644 --- a/cmd/scsi.c +++ b/cmd/scsi.c @@ -27,6 +27,8 @@ static int do_scsiboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) */ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { + int ret; + switch (argc) { case 0: case 1: @@ -35,8 +37,10 @@ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) if (strncmp(argv[1], "res", 3) == 0) { printf("\nReset SCSI\n"); scsi_bus_reset(); - scsi_scan(1); - return 0; + ret = scsi_scan(1); + if (ret) + return CMD_RET_FAILURE; + return ret; } if (strncmp(argv[1], "inf", 3) == 0) { blk_list_devices(IF_TYPE_SCSI); @@ -51,8 +55,10 @@ static int do_scsi(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) return 0; } if (strncmp(argv[1], "scan", 4) == 0) { - scsi_scan(1); - return 0; + ret = scsi_scan(1); + if (ret) + return CMD_RET_FAILURE; + return ret; } if (strncmp(argv[1], "part", 4) == 0) { if (blk_list_part(IF_TYPE_SCSI)) diff --git a/common/scsi.c b/common/scsi.c index ba6561605810..839b30b9bb8e 100644 --- a/common/scsi.c +++ b/common/scsi.c @@ -524,7 +524,7 @@ removable: * (re)-scan the scsi bus and reports scsi device info * to the user if mode = 1 */ -void scsi_scan(int mode) +int scsi_scan(int mode) { unsigned char i, lun; int ret; @@ -558,6 +558,7 @@ void scsi_scan(int mode) #ifndef CONFIG_SPL_BUILD setenv_ulong("scsidevs", scsi_max_devs); #endif + return 0; } #ifdef CONFIG_BLK diff --git a/include/scsi.h b/include/scsi.h index eed8ff971731..c8796785a465 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -173,7 +173,7 @@ void scsi_low_level_init(int busdevfunc); * functions residing inside cmd_scsi.c */ void scsi_init(void); -void scsi_scan(int mode); +int scsi_scan(int mode); #define SCSI_IDENTIFY 0xC0 /* not used */