From patchwork Fri Nov 27 02:51:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 549279 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 C9C7B1402D7 for ; Fri, 27 Nov 2015 13:52:28 +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=Fq9Pbc09; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 51ED64B8F8; Fri, 27 Nov 2015 03:52:27 +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 EfSTmcDUaPQN; Fri, 27 Nov 2015 03:52:27 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A6AF64B8FA; Fri, 27 Nov 2015 03:52:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 33B3F4B8FA for ; Fri, 27 Nov 2015 03:51:43 +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 o2ESlRqHhgLF for ; Fri, 27 Nov 2015 03:51:42 +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-ob0-f174.google.com (mail-ob0-f174.google.com [209.85.214.174]) by theia.denx.de (Postfix) with ESMTPS id 1CF4A4B8F8 for ; Fri, 27 Nov 2015 03:51:39 +0100 (CET) Received: by obbnk6 with SMTP id nk6so73468738obb.2 for ; Thu, 26 Nov 2015 18:51:38 -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=6m0lNCdeedmVsoA7y4uNhRyQ1AANtNit1n68dd3KJC4=; b=Fq9Pbc091cyX04+p0XDf7wf8XrTXGk4aRguHjfeBA93doswbEfZvwgcz2MTAm3EZ35 5dEYQHTiwomN+c2bhskFd0V4O2FZqBaFYbxTPGjf/skVx5Bg3VSSYSNREMw0BcYcm9mW B6ftDn3su0PWyPzZ5qoQrb0EQWGqaUhV9j05xQaBCxj6B7FklIww7ae+uG1QWTx6/el3 7GdvODxAlCzicwRrqHNHC5QIOC4RKkmuyYrSZIv2x5EYbFzQ4Jpeni2HYK1shkBeb2vv OB1NiHRpmmjWp47sNNRrLN8mvB+yDf+slXP65ZZOICsqvUKZjd01qlRNYM/kbgGYHf7X h0fQ== 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=6m0lNCdeedmVsoA7y4uNhRyQ1AANtNit1n68dd3KJC4=; b=UQhEVxMutIcd6FfWuDJP4ToDUqWOgMtmjxvXPJ7P+Vi135r29pD79BG8M1FWhdkz0s Z2MucZUmGxS9Mh6J3AfxUhEx7KvHBZS5GFfeKcHxc26ZHVP18uU8/roH+cP/Faeh+YGZ dezJa+dds0IUNkiZn/uJZBZKJLOp0Fp5OwPEoBavl4hymN2V2TIX7hsc9N6ZFr8iG9CQ CpjpzTy8HuVFjcNp5WUkF6DeNHlOpNqxdVtlTXFkUJwUMpw8jXrjM4YVEKpmwjLFUu3P bdWVyi4MamY9RKZppwhaTXHq1JI1/4e5Rv19tcB3O885F2hXKZxK7OyQWmvVDThW2BYY 6adw== X-Gm-Message-State: ALoCoQlAAO9mXNTNSXlapJE7sUhekZ0n+dVgUTCFW+1Z2r+37mX5fr0MFnHLlmYi1WY4qd7Ld8QG X-Received: by 10.60.54.168 with SMTP id k8mr18215495oep.51.1448592697974; Thu, 26 Nov 2015 18:51:37 -0800 (PST) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:28fb:2b52:afad:5fc9]) by smtp.gmail.com with ESMTPSA id l17sm14376916oib.11.2015.11.26.18.51.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2015 18:51:37 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 62B12220D3A; Thu, 26 Nov 2015 19:51:36 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 26 Nov 2015 19:51:18 -0700 Message-Id: <1448592690-14911-2-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1448592690-14911-1-git-send-email-sjg@chromium.org> References: <1448592690-14911-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v3 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 v3: None 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; }