From patchwork Tue Jan 23 20:16:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 125571 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1981751ljf; Tue, 23 Jan 2018 12:18:17 -0800 (PST) X-Google-Smtp-Source: AH8x226FygLlGySgG194h0xoSLhvRqcoP4u9Vv46kmAA3MXrPO9tG1FymoB6fCq+mHCx1eGYnjR0 X-Received: by 10.80.162.39 with SMTP id 36mr20849979edl.96.1516738697168; Tue, 23 Jan 2018 12:18:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516738697; cv=none; d=google.com; s=arc-20160816; b=lCSGSelQngb/VQ5EXTe1+bgBKAN/HPptYODKsPT9SZzb46r/wSlIkbyX3tKgFzFwkH 5+S4vEhRsOEPZcArMXaWI15KfRM4jNpXmAbFA479TRX6fQa0MGNKwzDmEk048+oIMbG5 kMbbshfcyhwis3YiLtGO8GgNKl/MuFOORzkKl9kDRg0MIYnZRq3Yrgtbd4UxD97RInON b9VAmd+wRJ3i9Mrg8feW8gmV0Kv5mrcgZsJDP1AecW9ZMZuTbQyH27lJmFLe34RU2eVo WPOmM6TIUfzSfi49cK7ytad15YzfSVvAor6kAroOisDYGZigevmF1+er9cIt5SrTXxFH GQGQ== 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=olmVkPtQUpCd6/0LgGcBiBRXX+R7DJmzVP+YOZETsko=; b=Ccm13unWFFWcYElGXKcOKWD+ndTScUtrAJgNeXDVXfIsPh/qO6CvVbPnp6vBlq0/M0 BcmRTUOvyGa0JIi1Mfqgu3i+k1/YBBW2/9/VJy7OklE7GUlw/HrZelHqjPiFyEoXsy6l oaIlkVKb2eUixt1DGMgLBo1wm7ZvUJQcBYnQKpCDfNt1bXFEL8/qmrgcibvnlQTJdIvq FYSUoz1x1Iv13bUyQCkBx1M7o8I6iPNWD9tUpQ+JPS2GwZ9kR2VYgx2SKbe8S4Et6Ri7 mAf8BLdSdZOZLiTCv3ougK36UYFNR6lOJ1j1lP1Gmb26T6TbL58N7orQegMpiYqWOmb1 ztUQ== 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 k91si1545095edc.122.2018.01.23.12.18.16; Tue, 23 Jan 2018 12:18:17 -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 A9A37C21C3F; Tue, 23 Jan 2018 20:17:33 +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 E20EFC21E92; Tue, 23 Jan 2018 20:17:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6B73FC21DA6; Tue, 23 Jan 2018 20:17:08 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id F080CC21C3F for ; Tue, 23 Jan 2018 20:17:07 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id CA46320C12; Tue, 23 Jan 2018 21:17:07 +0100 (CET) Received: from localhost (LFbn-1-2035-97.w90-76.abo.wanadoo.fr [90.76.104.97]) by mail.free-electrons.com (Postfix) with ESMTPSA id 953B9207A8; Tue, 23 Jan 2018 21:17:07 +0100 (CET) From: Maxime Ripard To: Tom Rini Date: Tue, 23 Jan 2018 21:16:50 +0100 Message-Id: <8c0b36130b265e429f5ad0887c339776e4d47912.1516723179.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Cc: Andre Przywara , agraf@suse.de, u-boot@lists.denx.de, Maxime Ripard , Jagan Teki Subject: [U-Boot] [PATCH v3 01/15] 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: Andre Przywara Reviewed-by: Lukasz Majewski Reviewed-by: Simon Glass Signed-off-by: Maxime Ripard --- 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 d29f82cb5d6f..a2015c299aa9 100644 --- a/include/environment.h +++ b/include/environment.h @@ -293,13 +293,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