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/ether.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/gadget/ether.c')
-rw-r--r-- | drivers/usb/gadget/ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index d7aaaa29b1e1..bcac2e68660d 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
@@ -293,7 +293,7 @@ static int __init eth_bind(struct usb_composite_dev *cdev) | |||
293 | * but if the controller isn't recognized at all then | 293 | * but if the controller isn't recognized at all then |
294 | * that assumption is a bit more likely to be wrong. | 294 | * that assumption is a bit more likely to be wrong. |
295 | */ | 295 | */ |
296 | WARN(cdev, "controller '%s' not recognized; trying %s\n", | 296 | WARNING(cdev, "controller '%s' not recognized; trying %s\n", |
297 | gadget->name, | 297 | gadget->name, |
298 | eth_config_driver.label); | 298 | eth_config_driver.label); |
299 | device_desc.bcdDevice = | 299 | device_desc.bcdDevice = |