From patchwork Tue Nov 28 10:24:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 119819 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1514947qgn; Tue, 28 Nov 2017 02:26:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMY4dJdTiysvCj2yKthdXOZvcqFlVhYWNyi3Scb0O1SReieTL20QgXw9inCWpqdJUwy4BOJf X-Received: by 10.80.134.135 with SMTP id r7mr1946716eda.241.1511864782840; Tue, 28 Nov 2017 02:26:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511864782; cv=none; d=google.com; s=arc-20160816; b=LcC4kGNVIGkV+hgb7X+pTlcGKYzBbnBzx/ASOP0KCWj1AZIJmHJvpZLeLlTW1BI0kr 70CyZLP0DDhAkG1LKX8rsuc4aUAB4hiapwi/m9E+H8+KJjdov8GXKTnbYzIwiJD8zkso 9TyElhv0KuK+oMu4ap2FZmrSO26L+RfFcFxqQTqtaB+hFyjxhHPRWbb3ZS/7KfFvtAZv t6sEAJlawVPvP2fqIhoDZ1x43c1CYAN1lTyv9IScyuNUpA53F4Bh8RFeOeIHHXyd5Gy4 gyXkwBz3BdCqvCkpsqBm7rYz/VsoMlLbiUN4YQyRijfmAbteGgPaQVuqugm0LpCOpagx 7Rsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:arc-authentication-results; bh=Xcfwaf8OShZUgWUmXzjDnnLD4HF5b61/4d5W5T4o9yk=; b=Mui2Y2Ig8FTbea0rDywQ/yP2IY8sQIl6lxBxRdZxL/Lhkxxa87/Qv8MBQABzZelhWN 3l/VOwHwV2C4V2sdGe6ViG1614l/FhRp6pJmD6HZp+OBxg+OGywoEvfK7syyYNNCsDAn iOlTPzOQr48BIb3xBdKPKHY3hQLlaIvTQqtz/LPyFgFpgJNvN7/BHgn8gtp5ER0iWSA1 Tftzy2JgujNri6sAm9jnOCevj9JDSXEcx9rDTURN9Srx72mVIQwvxO2CYtP7wdlXTZjo bBa47La/ccSVBdanIWIobE5t3j7BReOtqzckxPEpTJfkY61EZhxF6tdnhz7DJZEXYNLW KxjA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id g8si3151574edb.338.2017.11.28.02.26.22; Tue, 28 Nov 2017 02:26:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 61B47C21E40; Tue, 28 Nov 2017 10:25:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8A664C21E26; Tue, 28 Nov 2017 10:24:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9C59DC21D6A; Tue, 28 Nov 2017 10:24:53 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id 52321C21D79 for ; Tue, 28 Nov 2017 10:24:53 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id A256520746; Tue, 28 Nov 2017 11:24:52 +0100 (CET) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 76ECC20380; Tue, 28 Nov 2017 11:24:52 +0100 (CET) From: Maxime Ripard To: Tom Rini Date: Tue, 28 Nov 2017 11:24:36 +0100 Message-Id: <7e3a78f964aaf9c1c4cabd0b2723b429cab73cdc.1511864667.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Cc: Thomas Petazzoni , u-boot@lists.denx.de, Andre Przywara , agraf@suse.de, Maxime Ripard , Jagan Teki Subject: [U-Boot] [PATCH 01/14] cmd: nvedit: Get rid of the env lookup X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The nvedit command is the only user of env_driver_lookup_default outside of the environment code itself, and it uses it only to print the environment it's about to save to during env save. As we're about to rework the environment to be able to handle multiple environment sources, we might not have an idea of what environment backend is going to be used before trying (and possibly failing for some). Therefore, it makes sense to remove that message and move it to the env_save function itself. As a side effect, we also can get rid of the call to env_driver_lookup_default that is also about to get refactored. Reviewed-by: Lukasz Majewski Signed-off-by: Maxime Ripard Reviewed-by: Andre Przywara Reviewed-by: Simon Glass --- cmd/nvedit.c | 4 ---- env/env.c | 4 +++- include/environment.h | 7 ------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 4e79d03856fe..a690d743cd46 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -708,10 +708,6 @@ ulong env_get_ulong(const char *name, int base, ulong default_val) static int do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - struct env_driver *env = env_driver_lookup_default(); - - printf("Saving Environment to %s...\n", env->name); - return env_save() ? 1 : 0; } diff --git a/env/env.c b/env/env.c index 76a5608628fc..094538ff5b62 100644 --- a/env/env.c +++ b/env/env.c @@ -52,7 +52,7 @@ static enum env_location env_get_default_location(void) return ENVL_UNKNOWN; } -struct env_driver *env_driver_lookup_default(void) +static struct env_driver *env_driver_lookup_default(void) { enum env_location loc = env_get_default_location(); struct env_driver *drv; @@ -115,6 +115,8 @@ int env_save(void) return -ENODEV; if (!drv->save) return -ENOSYS; + + printf("Saving Environment to %s...\n", drv->name); ret = drv->save(); if (ret) { debug("%s: Environment failed to save (err=%d)\n", __func__, diff --git a/include/environment.h b/include/environment.h index 7b9821638960..226e3ef2d23a 100644 --- a/include/environment.h +++ b/include/environment.h @@ -303,13 +303,6 @@ int env_import_redund(const char *buf1, const char *buf2); #endif /** - * env_driver_lookup_default() - Look up the default environment driver - * - * @return pointer to driver, or NULL if none (which should not happen) - */ -struct env_driver *env_driver_lookup_default(void); - -/** * env_get_char() - Get a character from the early environment * * This reads from the pre-relocation environemnt