summaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/st5481.h
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-07-25 01:45:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 10:53:29 -0700
commitb6c63937001889af6fe431aaba97e59d04e028e7 (patch)
treecf73a1124a73e62fa5353098c276bb18b44cb867 /drivers/isdn/hisax/st5481.h
parentf38954c93c4a548f55d73ac5c1cf5e7f4023bb6c (diff)
downloadop-kernel-dev-b6c63937001889af6fe431aaba97e59d04e028e7.zip
op-kernel-dev-b6c63937001889af6fe431aaba97e59d04e028e7.tar.gz
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/isdn/hisax/st5481.h')
-rw-r--r--drivers/isdn/hisax/st5481.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/st5481.h b/drivers/isdn/hisax/st5481.h
index 2044e71..cff7a63 100644
--- a/drivers/isdn/hisax/st5481.h
+++ b/drivers/isdn/hisax/st5481.h
@@ -220,7 +220,7 @@ enum {
#define ERR(format, arg...) \
printk(KERN_ERR "%s:%s: " format "\n" , __FILE__, __func__ , ## arg)
-#define WARN(format, arg...) \
+#define WARNING(format, arg...) \
printk(KERN_WARNING "%s:%s: " format "\n" , __FILE__, __func__ , ## arg)
#define INFO(format, arg...) \
@@ -412,7 +412,7 @@ struct st5481_adapter {
({ \
int status; \
if ((status = usb_submit_urb(urb, mem_flags)) < 0) { \
- WARN("usb_submit_urb failed,status=%d", status); \
+ WARNING("usb_submit_urb failed,status=%d", status); \
} \
status; \
})
OpenPOWER on IntegriCloud