From: "Marek Behún" <kabel@kernel.org>
To: Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>
Cc: "U-Boot Mailing List" <u-boot@lists.denx.de>,
"Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH v2 02/13] env: Drop env_get_char_spec() and old, unused .get_char() implementations
Date: Wed, 13 Oct 2021 17:45:46 +0200 [thread overview]
Message-ID: <20211013154557.28479-3-kabel@kernel.org> (raw)
In-Reply-To: <20211013154557.28479-1-kabel@kernel.org>
From: Marek Behún <marek.behun@nic.cz>
Commit b2cdef4861be ("env: restore old env_get_char() behaviour")
dropped the .get_char() method from struct env_driver, but left the two
existing implementations (eeprom and nvram) in case someone would use
them by overwriting weak function env_get_char_spec().
Since this was never done in the 3.5 years, let's drop these methods and
simplify the code.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
env/eeprom.c | 18 ------------------
env/env.c | 7 +------
env/nvram.c | 14 --------------
3 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/env/eeprom.c b/env/eeprom.c
index 253bdf1428..f8556a4721 100644
--- a/env/eeprom.c
+++ b/env/eeprom.c
@@ -64,24 +64,6 @@ static int eeprom_bus_write(unsigned dev_addr, unsigned offset,
return rcode;
}
-/** Call this function from overridden env_get_char_spec() if you need
- * this functionality.
- */
-int env_eeprom_get_char(int index)
-{
- uchar c;
- unsigned int off = CONFIG_ENV_OFFSET;
-
-#ifdef CONFIG_ENV_OFFSET_REDUND
- if (gd->env_valid == ENV_REDUND)
- off = CONFIG_ENV_OFFSET_REDUND;
-#endif
- eeprom_bus_read(CONFIG_SYS_I2C_EEPROM_ADDR,
- off + index + offsetof(env_t, data), &c, 1);
-
- return c;
-}
-
static int env_eeprom_load(void)
{
char buf_env[CONFIG_ENV_SIZE];
diff --git a/env/env.c b/env/env.c
index e534008006..91d220c3dd 100644
--- a/env/env.c
+++ b/env/env.c
@@ -166,17 +166,12 @@ static struct env_driver *env_driver_lookup(enum env_operation op, int prio)
return drv;
}
-__weak int env_get_char_spec(int index)
-{
- return *(uchar *)(gd->env_addr + index);
-}
-
int env_get_char(int index)
{
if (gd->env_valid == ENV_INVALID)
return default_environment[index];
else
- return env_get_char_spec(index);
+ return *(uchar *)(gd->env_addr + index);
}
int env_load(void)
diff --git a/env/nvram.c b/env/nvram.c
index f4126858b5..261b31edfb 100644
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -42,20 +42,6 @@ extern void nvram_write(long dest, const void *src, size_t count);
static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
#endif
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-/** Call this function from overridden env_get_char_spec() if you need
- * this functionality.
- */
-int env_nvram_get_char(int index)
-{
- uchar c;
-
- nvram_read(&c, CONFIG_ENV_ADDR + index, 1);
-
- return c;
-}
-#endif
-
static int env_nvram_load(void)
{
char buf[CONFIG_ENV_SIZE];
--
2.32.0
next prev parent reply other threads:[~2021-10-13 15:46 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-13 15:45 [PATCH v2 00/13] env_get_char() removal and env_get_f() refactor Marek Behún
2021-10-13 15:45 ` [PATCH v2 01/13] env: Fix documentation for env_get_f() Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-13 15:45 ` Marek Behún [this message]
2021-10-14 15:11 ` [PATCH v2 02/13] env: Drop env_get_char_spec() and old, unused .get_char() implementations Simon Glass
2021-10-13 15:45 ` [PATCH v2 03/13] examples: api: glue: Remove comment that does not apply anymore Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 04/13] env: Change env_match() to static and remove from header Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-14 16:06 ` Marek Behún
2021-10-14 18:24 ` Simon Glass
2021-10-15 0:40 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 05/13] env: Don't match empty variable name in env_match() Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 06/13] env: Check for terminating null-byte " Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 07/13] env: Inline env_get_char() into it's only user Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 08/13] env: Early return from env_get_f() on NULL name Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 09/13] env: Use string pointer instead of indexes in env_get_f() Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-15 0:40 ` Simon Glass
2021-10-15 13:20 ` Marek Behún
2021-10-13 15:45 ` [PATCH v2 10/13] env: Use better name for variable " Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-15 0:40 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 11/13] env: Make return value of env_get_f() behave like sprintf() on success Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 12/13] env: Use memcpy() instead of ad-hoc code to copy variable value Marek Behún
2021-10-14 15:11 ` Simon Glass
2021-10-13 15:45 ` [PATCH v2 13/13] env: Move non-cmd specific env functions to env/common.c Marek Behún
2021-10-14 15:11 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013154557.28479-3-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=marek.behun@nic.cz \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.