From patchwork Mon Jul 24 03:19:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 792627 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="jaokjCZ9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xG6Ht0lLhz9s1h for ; Mon, 24 Jul 2017 13:27:21 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B2BA8C21C8B; Mon, 24 Jul 2017 03:26:06 +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=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 46B56C21DE5; Mon, 24 Jul 2017 03:20:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A918AC21DB6; Mon, 24 Jul 2017 03:20:47 +0000 (UTC) Received: from mail-oi0-f49.google.com (mail-oi0-f49.google.com [209.85.218.49]) by lists.denx.de (Postfix) with ESMTPS id 13D56C21D8B for ; Mon, 24 Jul 2017 03:20:36 +0000 (UTC) Received: by mail-oi0-f49.google.com with SMTP id a9so13916171oih.0 for ; Sun, 23 Jul 2017 20:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=oCcr1GqW5c67pzM3fD01XKeKttzbUWQ51z0467j4Kao=; b=jaokjCZ9//z1yxbGjruoZ3vQq/TSsslvwgAvpl+00IwC6QgdmITXahBFiqnYhCYcIA sppjjQhyDs8/XfuCc9/Dese1Hh5i6DWhDMaQqCSvZqTrLCxmC1eABRBXGuu9FDS/ogPv jbS0aiW3nfTaGawvOMulQ61YbpHULQ+KXh7H6KuT2ClL5X7THiRPKsMlF5knzM2f62GY WIWGtZ7cJF28HgbOq/pLf3u5R/9+7QVCEkObmls5DpGW/KndKVypNbyDfZRw6KvXFenu F4o/Vcnqr2yM0NmdAkODOrZL30L7A74fdqjbGmzeZHWUQDZYn72/bkJ4lLXZqr0Rp3CL d6Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=oCcr1GqW5c67pzM3fD01XKeKttzbUWQ51z0467j4Kao=; b=aazvfV+9gBrS7dH/Z3PkHZT8ZXqlkoEJnwSMiRF53AwhbC+ye0SkLqxsx0Y5cpgvv7 IYI374xbzpx4ZUyfj3K7VXPgs+NNetmr3PvH04xSVU+ONBUP6+EouEnZ3Oxa0w8GRSoO E/+RuS03Wa97P6bIbfluz6cWfa2cw3Ggdy0YeNeJN8YHUKG97/yeZD49x74DCr5Lv1eI na8esm2bNSoSi8+GRU+4s/sISnS5HFdev5z0mks/oR/tbAEXGs2hJGLhxiniVdnrIkZl 3W5zD2o4YwY2ASivVQjC+tbBfdSG5q3TcveoiPhOYT/ugyExf+MPKfsaKVOLwoSLxEoQ tlYQ== X-Gm-Message-State: AIVw113OSNOYH9InOjhOBTt+xFxaoY7WRFg2wTnJsyP/QG9GY6FPU3eA P4h5MI+dfFVjMlC5 X-Received: by 10.202.71.83 with SMTP id u80mr3181612oia.123.1500866434752; Sun, 23 Jul 2017 20:20:34 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:0:10f2:0:bd98:3ea1:ea41:e573]) by smtp.gmail.com with ESMTPSA id d7sm7571186oia.10.2017.07.23.20.20.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Jul 2017 20:20:34 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id 6D955142323; Sun, 23 Jul 2017 21:20:33 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 23 Jul 2017 21:19:50 -0600 Message-Id: <20170724032009.43994-16-sjg@chromium.org> X-Mailer: git-send-email 2.14.0.rc0.284.gd933b75aa4-goog In-Reply-To: <20170724032009.43994-1-sjg@chromium.org> References: <20170724032009.43994-1-sjg@chromium.org> Cc: Tom Rini , Joe Hershberger , Andreas Fenkart Subject: [U-Boot] [PATCH v2 15/34] env: common: Drop env_get_addr() 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" This function is not used anywhere other than env_get_char(). Move the code into that function. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- Changes in v2: None env/common.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/env/common.c b/env/common.c index ff3f47e536..ce6b5f927a 100644 --- a/env/common.c +++ b/env/common.c @@ -41,17 +41,12 @@ static uchar env_get_char_init(int index) return default_environment[index]; } -static const uchar *env_get_addr(int index) +static uchar env_get_char_memory(int index) { if (gd->env_valid) - return (uchar *)(gd->env_addr + index); + return *(uchar *)(gd->env_addr + index); else - return &default_environment[index]; -} - -static uchar env_get_char_memory(int index) -{ - return *env_get_addr(index); + return default_environment[index]; } uchar env_get_char(int index)