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.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/pxa25x_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 8fb0066609bb..7e6725d89976 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -342,7 +342,7 @@ pxa25x_ep_free_request (struct usb_ep *_ep, struct usb_request *_req) | |||
342 | struct pxa25x_request *req; | 342 | struct pxa25x_request *req; |
343 | 343 | ||
344 | req = container_of (_req, struct pxa25x_request, req); | 344 | req = container_of (_req, struct pxa25x_request, req); |
345 | WARN_ON (!list_empty (&req->queue)); | 345 | WARN_ON(!list_empty (&req->queue)); |
346 | kfree(req); | 346 | kfree(req); |
347 | } | 347 | } |
348 | 348 | ||
@@ -1556,7 +1556,7 @@ config_change: | |||
1556 | * tell us about config change events, | 1556 | * tell us about config change events, |
1557 | * so later ones may fail... | 1557 | * so later ones may fail... |
1558 | */ | 1558 | */ |
1559 | WARN("config change %02x fail %d?\n", | 1559 | WARNING("config change %02x fail %d?\n", |
1560 | u.r.bRequest, i); | 1560 | u.r.bRequest, i); |
1561 | return; | 1561 | return; |
1562 | /* TODO experiment: if has_cfr, | 1562 | /* TODO experiment: if has_cfr, |
@@ -2330,7 +2330,7 @@ static int pxa25x_udc_suspend(struct platform_device *dev, pm_message_t state) | |||
2330 | unsigned long flags; | 2330 | unsigned long flags; |
2331 | 2331 | ||
2332 | if (!udc->mach->gpio_pullup && !udc->mach->udc_command) | 2332 | if (!udc->mach->gpio_pullup && !udc->mach->udc_command) |
2333 | WARN("USB host won't detect disconnect!\n"); | 2333 | WARNING("USB host won't detect disconnect!\n"); |
2334 | udc->suspended = 1; | 2334 | udc->suspended = 1; |
2335 | 2335 | ||
2336 | local_irq_save(flags); | 2336 | local_irq_save(flags); |