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/omap_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/omap_udc.c')
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 4b79a8509e84..395bd1844482 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -1120,7 +1120,7 @@ static int omap_ep_set_halt(struct usb_ep *_ep, int value) | |||
1120 | status = -EINVAL; | 1120 | status = -EINVAL; |
1121 | else if (value) { | 1121 | else if (value) { |
1122 | if (ep->udc->ep0_set_config) { | 1122 | if (ep->udc->ep0_set_config) { |
1123 | WARN("error changing config?\n"); | 1123 | WARNING("error changing config?\n"); |
1124 | omap_writew(UDC_CLR_CFG, UDC_SYSCON2); | 1124 | omap_writew(UDC_CLR_CFG, UDC_SYSCON2); |
1125 | } | 1125 | } |
1126 | omap_writew(UDC_STALL_CMD, UDC_SYSCON2); | 1126 | omap_writew(UDC_STALL_CMD, UDC_SYSCON2); |
@@ -1764,7 +1764,7 @@ do_stall: | |||
1764 | u.r.bRequestType, u.r.bRequest, status); | 1764 | u.r.bRequestType, u.r.bRequest, status); |
1765 | if (udc->ep0_set_config) { | 1765 | if (udc->ep0_set_config) { |
1766 | if (udc->ep0_reset_config) | 1766 | if (udc->ep0_reset_config) |
1767 | WARN("error resetting config?\n"); | 1767 | WARNING("error resetting config?\n"); |
1768 | else | 1768 | else |
1769 | omap_writew(UDC_CLR_CFG, UDC_SYSCON2); | 1769 | omap_writew(UDC_CLR_CFG, UDC_SYSCON2); |
1770 | } | 1770 | } |
@@ -3076,7 +3076,7 @@ static int omap_udc_suspend(struct platform_device *dev, pm_message_t message) | |||
3076 | * which would prevent entry to deep sleep... | 3076 | * which would prevent entry to deep sleep... |
3077 | */ | 3077 | */ |
3078 | if ((devstat & UDC_ATT) != 0 && (devstat & UDC_SUS) == 0) { | 3078 | if ((devstat & UDC_ATT) != 0 && (devstat & UDC_SUS) == 0) { |
3079 | WARN("session active; suspend requires disconnect\n"); | 3079 | WARNING("session active; suspend requires disconnect\n"); |
3080 | omap_pullup(&udc->gadget, 0); | 3080 | omap_pullup(&udc->gadget, 0); |
3081 | } | 3081 | } |
3082 | 3082 | ||