From patchwork Wed Jul 26 17:19:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 794041 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="YOseJhNh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xHhlj4dMBz9sNV for ; Thu, 27 Jul 2017 03:23:29 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 543FCC220FB; Wed, 26 Jul 2017 17:22:56 +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 093A3C22005; Wed, 26 Jul 2017 17:20:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9E892C21FB1; Wed, 26 Jul 2017 17:20:14 +0000 (UTC) Received: from mail-oi0-f51.google.com (mail-oi0-f51.google.com [209.85.218.51]) by lists.denx.de (Postfix) with ESMTPS id 7AA21C21F1D for ; Wed, 26 Jul 2017 17:20:10 +0000 (UTC) Received: by mail-oi0-f51.google.com with SMTP id g131so86204906oic.3 for ; Wed, 26 Jul 2017 10:20:10 -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=xIgRBx6MVvHh7Y2AlsSitJMbfYoEP4XpOg0aFj3kFBo=; b=YOseJhNhcqKcfmUG6rDY9lVI2fDgCslZrsCDlHhGG0taChnV8xhIP1HYf+PgogcktT AlFksD9xN0C1lAgbNMaeDzIaQ847JgAbMnXNPeH4wJktRJxqDRyKd5DLxdGaJpNhLlYc ZhudhdkMO0K+6ZjdlgAC5mNVswaj+JDWm5FPk5LhcHklgcN3VCSLubOTMcKyCNaiEWa+ lQQ0A5fnM3m9gFDxEJhjgJPp5bvxW5IVpKjW8/U90/OcxO0VQEeCBPjY6bhJY9zIjaRL Y1n9/MyoyHxfpSBMVVQRauZbgBVzebFuYgGMQ8oF/qDeQnZpqv2zs+2vgc407wK57dw0 g2iA== 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=xIgRBx6MVvHh7Y2AlsSitJMbfYoEP4XpOg0aFj3kFBo=; b=Cucx9sG/Fmc2TjHUjF6JW5YIJMEX9DI74Ysagz5F0fVvYZmMlBENV/VMuy5J4SF43v OLXAATkUBAQYyrZJr/Kadwiheu0WQ88F7zD01yuJZp/uZ6mOO4OOH/UgvMjVXnVNAdxW nmGM7tIaO/Ipe+QPr54IJM+xSIqFjcF1hac+qay1c1V/2nXGjo286KqwmW2UNezAOCeX CaZ8BmTJ+K2wtucmmQfIS/DPvne7MBbHEaRdfzQWdptPgfrFsZQ2IzIpkemSFJql3F0y mr2+ED1Zf0VqqVDZuJbBoj6pqNAf3aPyVwkuRZ/x/42cmw+KQNl3aMxH4mx/6Xleolko Zhhw== X-Gm-Message-State: AIVw113yq9I6qJv/yLFNtEYx5yqmOxjSPli8J2JxEFGaehHSkEh8KV8E NH1dYc4QQw+fGEk/ X-Received: by 10.202.102.74 with SMTP id a71mr1274740oic.296.1501089608858; Wed, 26 Jul 2017 10:20:08 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([100.101.164.89]) by smtp.gmail.com with ESMTPSA id j82sm11461757oib.47.2017.07.26.10.20.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Jul 2017 10:20:07 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id D969F1404B2; Wed, 26 Jul 2017 11:20:06 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Wed, 26 Jul 2017 11:19:29 -0600 Message-Id: <20170726171948.160445-6-sjg@chromium.org> X-Mailer: git-send-email 2.14.0.rc0.400.g1c36432dff-goog In-Reply-To: <20170726171948.160445-1-sjg@chromium.org> References: <20170726171948.160445-1-sjg@chromium.org> Cc: Tom Rini , Joe Hershberger , Andreas Fenkart Subject: [U-Boot] [PATCH v3 05/24] 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. Reviewed-by: Tom Rini Signed-off-by: Simon Glass --- Changes in v3: None 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 5a17e52615..2e94dd71e2 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)