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/misc/usbtest.c | |
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/misc/usbtest.c')
-rw-r--r-- | drivers/usb/misc/usbtest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index 054dedd28127..b358c4e1cf21 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c | |||
@@ -81,7 +81,7 @@ static struct usb_device *testdev_to_usbdev (struct usbtest_dev *test) | |||
81 | 81 | ||
82 | #define ERROR(tdev, fmt, args...) \ | 82 | #define ERROR(tdev, fmt, args...) \ |
83 | dev_err(&(tdev)->intf->dev , fmt , ## args) | 83 | dev_err(&(tdev)->intf->dev , fmt , ## args) |
84 | #define WARN(tdev, fmt, args...) \ | 84 | #define WARNING(tdev, fmt, args...) \ |
85 | dev_warn(&(tdev)->intf->dev , fmt , ## args) | 85 | dev_warn(&(tdev)->intf->dev , fmt , ## args) |
86 | 86 | ||
87 | /*-------------------------------------------------------------------------*/ | 87 | /*-------------------------------------------------------------------------*/ |
@@ -1946,7 +1946,7 @@ usbtest_probe (struct usb_interface *intf, const struct usb_device_id *id) | |||
1946 | 1946 | ||
1947 | status = get_endpoints (dev, intf); | 1947 | status = get_endpoints (dev, intf); |
1948 | if (status < 0) { | 1948 | if (status < 0) { |
1949 | WARN(dev, "couldn't get endpoints, %d\n", | 1949 | WARNING(dev, "couldn't get endpoints, %d\n", |
1950 | status); | 1950 | status); |
1951 | return status; | 1951 | return status; |
1952 | } | 1952 | } |