[PATCH v2 1/2] env: mmc: Clean up macro usage

[Marek Vasut]

Consistently use 'if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID))' instead of
mix of ifdef.

Signed-off-by: Marek Vasut <ma...@denx.de>
---
Cc: Patrice Chotard <patrice.chot...@foss.st.com>
Cc: Patrick Delaunay <patrick.delau...@foss.st.com>
Cc: Tom Rini <tr...@konsulko.com>
---
V2: Replace CONFIG_IS_ENABLED(PARTITION_TYPE_GUID) with 
IS_ENABLED(CONFIG_PARTITION_TYPE_GUID)
---
 env/mmc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/env/mmc.c b/env/mmc.c
index 5b01f657a7a..d51a5579128 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -73,8 +73,7 @@ static inline int mmc_offset_try_partition(const char *str, 
int copy, s64 *val)
 
                if (str && !strncmp((const char *)info.name, str, 
sizeof(info.name)))
                        break;
-#ifdef CONFIG_PARTITION_TYPE_GUID
-               if (!str) {
+               if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) && !str) {
                        const efi_guid_t env_guid = 
PARTITION_U_BOOT_ENVIRONMENT;
                        efi_guid_t type_guid;
 
@@ -82,7 +81,6 @@ static inline int mmc_offset_try_partition(const char *str, 
int copy, s64 *val)
                        if (!memcmp(&env_guid, &type_guid, sizeof(efi_guid_t)))
                                break;
                }
-#endif
        }
 
        /* round up to info.blksz */
-- 
2.39.1