From: Sean Anderson <seanga2@gmail.com>
Date: Mon, 5 Oct 2020 01:39:57 +0000 (-0400)
Subject: dm: Don't undefine dev_xxx macros
X-Git-Tag: v2025.01-rc5-pxa1908~2176^2
X-Git-Url: http://git.dujemihanovic.xyz/%22http:/kyber.dk/phpMyBuilder/static/%7B%7B%20.Permalink%20%7D%7D?a=commitdiff_plain;h=4a1989c0bc77565493fd142ce224d5d0c88deda9;p=u-boot.git

dm: Don't undefine dev_xxx macros

Now that linux/compat.h does not define these macros, we do not need to
undefine them.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/include/dm/device_compat.h b/include/dm/device_compat.h
index 8f26053b45..82d7a7d492 100644
--- a/include/dm/device_compat.h
+++ b/include/dm/device_compat.h
@@ -15,26 +15,6 @@
 #include <linux/build_bug.h>
 #include <linux/compat.h>
 
-/*
- * REVISIT:
- * remove the following after resolving conflicts with <linux/compat.h>
- */
-#ifdef dev_dbg
-#undef dev_dbg
-#endif
-#ifdef dev_vdbg
-#undef dev_vdbg
-#endif
-#ifdef dev_info
-#undef dev_info
-#endif
-#ifdef dev_err
-#undef dev_err
-#endif
-#ifdef dev_warn
-#undef dev_warn
-#endif
-
 /*
  * Define a new identifier which can be tested on by C code. A similar
  * definition is made for DEBUG in <log.h>.