diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-07-25 04:45:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 13:53:29 -0400 |
commit | b6c63937001889af6fe431aaba97e59d04e028e7 (patch) | |
tree | cf73a1124a73e62fa5353098c276bb18b44cb867 /drivers/usb/gadget/pxa25x_udc.h | |
parent | f38954c93c4a548f55d73ac5c1cf5e7f4023bb6c (diff) |
Rename WARN() to WARNING() to clear the namespace
We want to use WARN() as a variant of WARN_ON(), however a few drivers are
using WARN() internally. This patch renames these to WARNING() to avoid the
namespace clash. A few cases were defining but not using the thing, for those
cases I just deleted the definition.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Acked-by: Greg KH <greg@kroah.com>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/usb/gadget/pxa25x_udc.h')
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h index 4d11ece7c95f..c8a13215e02c 100644 --- a/drivers/usb/gadget/pxa25x_udc.h +++ b/drivers/usb/gadget/pxa25x_udc.h | |||
@@ -259,7 +259,7 @@ dump_state(struct pxa25x_udc *dev) | |||
259 | #define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0) | 259 | #define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0) |
260 | 260 | ||
261 | #define ERR(stuff...) pr_err("udc: " stuff) | 261 | #define ERR(stuff...) pr_err("udc: " stuff) |
262 | #define WARN(stuff...) pr_warning("udc: " stuff) | 262 | #define WARNING(stuff...) pr_warning("udc: " stuff) |
263 | #define INFO(stuff...) pr_info("udc: " stuff) | 263 | #define INFO(stuff...) pr_info("udc: " stuff) |
264 | 264 | ||
265 | 265 | ||