diff mbox series

[3/5] sysreset: mpc83xx: fix CONFIG_IS_ENABLED logic

Message ID 20200501145516.18168-4-rasmus.villemoes@prevas.dk
State New
Headers show
Series some sysreset patches (mostly for mpc83xx) | expand

Commit Message

Rasmus Villemoes May 1, 2020, 2:55 p.m. UTC 
Unlike IS_ENABLED, one should not include the CONFIG_ part in the
argument to CONFIG_IS_ENABLED - currently, the first of these tests
for whether CONFIG_CONFIG_AER_FULL or CONFIG_SPL_CONFIG_AER_FULL are
defined (depending on SPL or not), similarly for the other one.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes at prevas.dk>
---
 drivers/sysreset/sysreset_mpc83xx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c
index 3447b8e75c..631ae6a5dc 100644
--- a/drivers/sysreset/sysreset_mpc83xx.c
+++ b/drivers/sysreset/sysreset_mpc83xx.c
@@ -103,7 +103,7 @@  static int print_83xx_arb_event(bool force, char *buf, int size)
 	if (!force && !gd->arch.arbiter_event_address)
 		return 0;
 
-	if (CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_FULL)) {
+	if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL)) {
 		res = scnprintf(buf, size,
 				"Arbiter Event Status:\n"
 				"    %s: 0x%08lX\n"
@@ -116,7 +116,7 @@  static int print_83xx_arb_event(bool force, char *buf, int size)
 				"Master ID", mstr_id, master[mstr_id],
 				"Transfer Size", tsize_val, tsize_bytes,
 				"Transfer Type", ttype, transfer[ttype]);
-	} else if (CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) {
+	} else if (CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) {
 		res = scnprintf(buf, size,
 				"Arbiter Event Status: AEATR=0x%08lX, AEADR=0x%08lX\n",
 				gd->arch.arbiter_event_attributes,
@@ -172,8 +172,8 @@  static int mpc83xx_sysreset_get_status(struct udevice *dev, char *buf, int size)
 	 * TODO(mario.six at gdsys.cc): Move this into a dedicated
 	 *			     arbiter driver
 	 */
-	if (CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_FULL) ||
-	    CONFIG_IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) {
+	if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL) ||
+	    CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) {
 		/*
 		 * If there was a bus monitor reset event, we force the arbiter
 		 * event to be printed