Skip to contentSkip to conversation

SPL: ext: remove redundant ifdef statement

PATCH In review Petr Kulhavy 3 participants 3 messages Jun 14, 2016 – Jun 19, 2016

lore
Share & tools
lore

Petr Kulhavy

author
#0 lore raw

PATCH 1/1 SPL: ext: remove redundant ifdef statement

Remove redundant #if defined(CONFIG_SPL_OS_BOOT) statement around getenv() calls in spl_load_image_ext_os().

The whole function is surrounded by #ifdef CONFIG_SPL_OS_BOOT.

No functional change.

Signed-off-by Petr Kulhavy <[email protected]>
CC Guillaume GARDET <[email protected]>
---
 common/spl/spl_ext.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
common/spl/spl_ext.c +1 -2
index 074b31e..9a230d5 100644
@@ -88,8 +88,7 @@ int spl_load_image_ext_os(struct blk_desc *block_dev, int partition)
 #endif
 		return -1;
 	}
-
-#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
+#if defined(CONFIG_SPL_ENV_SUPPORT)
 	file = getenv("falcon_args_file");
 	if (file) {
 		err = ext4fs_open(file, &filelen);
Signature · 1 line
2.5.0
#1 lore raw

PATCH 1/1 SPL: ext: remove redundant ifdef statement

Le 14/06/2016 12:06, Petr Kulhavy a ?crit :

Quoted 9 lines

Remove redundant #if defined(CONFIG_SPL_OS_BOOT) statement around getenv() calls in spl_load_image_ext_os().

The whole function is surrounded by #ifdef CONFIG_SPL_OS_BOOT.

No functional change.

Signed-off-by Petr Kulhavy <[email protected]>
CC Guillaume GARDET <[email protected]>
Acked-by Guillaume GARDET <[email protected]>
Quoted 18 lines
---
  common/spl/spl_ext.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
common/spl/spl_ext.c +1 -2
index 074b31e..9a230d5 100644
@@ -88,8 +88,7 @@ int spl_load_image_ext_os(struct blk_desc *block_dev, int partition)
  #endif
  		return -1;
  	}
-
-#if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
+#if defined(CONFIG_SPL_ENV_SUPPORT)
  	file = getenv("falcon_args_file");
  	if (file) {
  		err = ext4fs_open(file, &filelen);
#2 lore raw
In reply to Petr Kulhavy
Quoted 10 lines · Petr Kulhavy

Remove redundant #if defined(CONFIG_SPL_OS_BOOT) statement around getenv() calls in spl_load_image_ext_os().

The whole function is surrounded by #ifdef CONFIG_SPL_OS_BOOT.

No functional change.

Signed-off-by Petr Kulhavy <[email protected]>
CC Guillaume GARDET <[email protected]>
Acked-by Guillaume GARDET <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160619/77250777/attachment.sig>