From patchwork Tue Mar 10 10:32:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 1252077 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=vdCJm+M6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48cBJj2pzKz9s3x for ; Tue, 10 Mar 2020 21:33:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F3EE812E1; Tue, 10 Mar 2020 11:33:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vdCJm+M6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D50D5812B8; Tue, 10 Mar 2020 11:33:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2E450812B8 for ; Tue, 10 Mar 2020 11:33:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alex.kiernan@gmail.com Received: by mail-wm1-x341.google.com with SMTP id 6so724949wmi.5 for ; Tue, 10 Mar 2020 03:33:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=iw7TiABBbL31pAnG3JgNsLEeOpqz0lo41VfStt3x0aA=; b=vdCJm+M65bX59VMMxN0y9mCjCzWV/lCkniHDQyBdl3Ix+WZwgvxY3CckjAX1tzxBc+ 5FfoFN4OlgWRhP97IOaW2eFmjzwuBgAVha1nVqF96r/tiaLNirOr1qwmRpaeou6xmGP7 QnJXa4egd6EXiP+xy7FwOs3+bkjJWZQk5MZXi/CaQZMP0d9D4x8ncqQ8bDToK2yXxVxK /4JMnciVdSIXa7btdjXBc3GTtxzW+E5LI+m++jSUd9DLC+mmbhH7W+rFvEqOV6msoZ5K CQ3lbRSp2GYD9ICTH3FAlYs6BmuqZ5Jf71PUPSlOHzn9w6iB3IzKZS/JtbLvz749gcAn EYiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iw7TiABBbL31pAnG3JgNsLEeOpqz0lo41VfStt3x0aA=; b=t9ALhCTyda81NdSdzWNxuum2bCKweTuoQeIappCBl9xrvqfLG68ahcP+Z3osNOl2Id E/lVRrpr/Ozh3IreLwy3Va+NaKHygwa3BsdIYMM9bhX8zDHM+6fZPv3IbzqYcWiNeWSZ VZfcVBHgZMFY5OV6rkkESksEcsY1kC/QbbJoNZGkbH5k43zOT8Ptf09VDOFOWz6jYeTW BtCeZ1RATk1kmuwR1fMILkqdjavU6la/EF+Vk+yzW3eGMmNkZygSmx/QGhiKZ55Joa3E pXzMSSQdkLg7YBassH6ODm/+OH5BOhrvJZxqzkoYMwpmubS3Zl0mWhrWbJmHtBiNf8Dx YeOg== X-Gm-Message-State: ANhLgQ3AkFJL7nLorlSGA/zUub53VBo+dm8n1EDViTeferTrEQ7kJkXb E4FHSciQrTO22bp/oudX0Sw3Akx6 X-Google-Smtp-Source: ADFU+vsPIB38ZiToKE1Ysi1Dn5LpwhZGj23U0jITEAxvMYDpXiojIGtDDZ/UTfDRE+quTULAxvMa2Q== X-Received: by 2002:a1c:750e:: with SMTP id o14mr1479152wmc.156.1583836394238; Tue, 10 Mar 2020 03:33:14 -0700 (PDT) Received: from localhost.localdomain ([195.89.163.130]) by smtp.gmail.com with ESMTPSA id a1sm25353356wru.75.2020.03.10.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 03:33:13 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Cc: Luka Kovacic , Robert Marko , Alex Kiernan , Bin Meng , Heinrich Schuchardt , Simon Glass Subject: [PATCH] cmd: gpio: Make `gpio input` return pin value again Date: Tue, 10 Mar 2020 10:32:49 +0000 Message-Id: <20200310103249.65203-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean 4dbc107f4683 ("cmd: gpio: Correct do_gpio() return value") correctly changed the behaviour of the gpio command to return CMD_RET_SUCCESS or CMD_RET_FAILURE. But any existing script which expects the return value to be the pin value is broken by this change. Reinstate the legacy behaviour for `gpio input` only. Fixes: 4dbc107f4683 ("cmd: gpio: Correct do_gpio() return value") Signed-off-by: Alex Kiernan Reviewed-by: Simon Glass --- cmd/gpio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/gpio.c b/cmd/gpio.c index 16c2cebb3d4b..b716f6f18b95 100644 --- a/cmd/gpio.c +++ b/cmd/gpio.c @@ -248,7 +248,11 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (ret != -EBUSY) gpio_free(gpio); - return CMD_RET_SUCCESS; + /* + * Whilst wrong, the legacy gpio input command returns the pin value + * (or CMD_RET_FAILURE) + */ + return (sub_cmd == GPIOC_INPUT) ? value : CMD_RET_SUCCESS; err: if (ret != -EBUSY)