From patchwork Sat Nov 21 23:28:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 547257 X-Patchwork-Delegate: sjg@chromium.org 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 53B511401E7 for ; Sun, 22 Nov 2015 10:29:10 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=j0mOfIyU; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D24E7A746A; Sun, 22 Nov 2015 00:29:06 +0100 (CET) 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 iGueuvV6jXCk; Sun, 22 Nov 2015 00:29:06 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A90D5A7452; Sun, 22 Nov 2015 00:29:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 10F144B8FD for ; Sun, 22 Nov 2015 00:28:45 +0100 (CET) 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 I6L0LLtSIc9x for ; Sun, 22 Nov 2015 00:28:44 +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-ig0-f175.google.com (mail-ig0-f175.google.com [209.85.213.175]) by theia.denx.de (Postfix) with ESMTPS id 41DE94B8FA for ; Sun, 22 Nov 2015 00:28:41 +0100 (CET) Received: by igcto18 with SMTP id to18so35239162igc.0 for ; Sat, 21 Nov 2015 15:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=8W/zIGWncVS+WX9LbXd/13oLJVmOxtWO5PfUMRNW3xE=; b=j0mOfIyUSJ51IC1PAsP+oaZuvxfPH7fi6KCrxaH9xyflDvIsopQMAfU35AH9CAjRb6 BV4d7lMU+2EMWsu/UoC0pTBJ4Z00TDOxCydJpKZOm5mvGAezpjzZidsBY9zfnJ+dhDI3 NzxGvBHhTyFg56FbdOTMRqB4irkqKxxsw+rLjQseYLedJyoWZ1IV+qOvwTpDhLPbqv8m Pl0KfkxUUTHhoDcYEoiZ8297SA/Vj3hMWaK079pcYTdf59/iP4VIgYhpyPvHFp4tHcus fonTKWbKMm9ZJbxHppIo56WtbcxT/si9lWP8/vKJjckd1EccXSXmYN0Y+15Hz7x2id/O o2xw== 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; bh=8W/zIGWncVS+WX9LbXd/13oLJVmOxtWO5PfUMRNW3xE=; b=X+d07IW+zl4UcrAHFEmsOuNbtbAPSe3xfu/ZhLhhedz4iiiZPw7GAvjxoUkUI7Wa+O XasbLvfjdHFnorbE6hwylaqQam8M/NaZTi0brBEWxZ6bHZFYGChBTWKR9O66PdrmoLrg JHL5Sfw3FGhwxM8hsGEt3//fG1PNhs6qELXGJGC3tNjJMtB71e3Osc5ZH2cY6qd/+sUi vjuV3+kkNyB11WGUHTNu4F7FUT8Y38Ne4drbcYDpup5jhGCPQM9q89QWhRb+cXlfQBOi hVT16M87YrG7Uiqd4LpZUmj7W1FjB/PJO5TKEqd42u3S0RkUANQIjYylAj+ei4ZdVdk4 9LkQ== X-Gm-Message-State: ALoCoQlRi0gl+fMqfjz4xctKoL260dHIPAlTC4wxHNqxZZkbr5jqciyDzHBgKGK3L/I8qC65P0Dx X-Received: by 10.50.32.40 with SMTP id f8mr7456527igi.51.1448148519865; Sat, 21 Nov 2015 15:28:39 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id vs11sm2537068igb.6.2015.11.21.15.28.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Nov 2015 15:28:38 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 862EA220C25; Sat, 21 Nov 2015 16:28:37 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sat, 21 Nov 2015 16:28:16 -0700 Message-Id: <1448148508-17207-2-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1448148508-17207-1-git-send-email-sjg@chromium.org> References: <1448148508-17207-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v2 01/13] pci: Use a common return in command processing 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" Adjust the commands to return from the same place. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- Changes in v2: None common/cmd_pci.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/common/cmd_pci.c b/common/cmd_pci.c index 2eafd5c..f3148a3 100644 --- a/common/cmd_pci.c +++ b/common/cmd_pci.c @@ -410,6 +410,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong addr = 0, value = 0, size = 0; pci_dev_t bdf = 0; char cmd = 's'; + int ret = 0; if (argc > 1) cmd = argv[1][0]; @@ -453,7 +454,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) switch (argv[1][0]) { case 'h': /* header */ pci_header_show(bdf); - return 0; + break; case 'd': /* display */ return pci_cfg_display(bdf, addr, size, value); #ifdef CONFIG_CMD_PCI_ENUM @@ -463,23 +464,29 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) # else pci_init(); # endif - return 0; + break; #endif case 'n': /* next */ if (argc < 4) goto usage; - return pci_cfg_modify(bdf, addr, size, value, 0); + ret = pci_cfg_modify(bdf, addr, size, value, 0); + break; case 'm': /* modify */ if (argc < 4) goto usage; - return pci_cfg_modify(bdf, addr, size, value, 1); + ret = pci_cfg_modify(bdf, addr, size, value, 1); + break; case 'w': /* write */ if (argc < 5) goto usage; - return pci_cfg_write(bdf, addr, size, value); + ret = pci_cfg_write(bdf, addr, size, value); + break; + default: + ret = CMD_RET_USAGE; + break; } - return 1; + return ret; usage: return CMD_RET_USAGE; }