From: Arjan van de Ven 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 Acked-by: Greg KH Cc: Karsten Keil Signed-off-by: Andrew Morton --- drivers/isdn/hisax/st5481.h | 4 ++-- drivers/isdn/hisax/st5481_b.c | 4 ++-- drivers/isdn/hisax/st5481_d.c | 6 +++--- drivers/isdn/hisax/st5481_usb.c | 18 +++++++++--------- drivers/usb/gadget/at91_udc.h | 2 +- drivers/usb/gadget/cdc2.c | 2 +- drivers/usb/gadget/ether.c | 2 +- drivers/usb/gadget/file_storage.c | 14 +++++++------- drivers/usb/gadget/fsl_usb2_udc.c | 2 +- drivers/usb/gadget/fsl_usb2_udc.h | 2 +- drivers/usb/gadget/gmidi.c | 2 -- drivers/usb/gadget/goku_udc.c | 2 +- drivers/usb/gadget/goku_udc.h | 2 +- drivers/usb/gadget/inode.c | 2 -- drivers/usb/gadget/net2280.c | 2 +- drivers/usb/gadget/net2280.h | 2 +- drivers/usb/gadget/omap_udc.c | 6 +++--- drivers/usb/gadget/omap_udc.h | 2 +- drivers/usb/gadget/printer.c | 2 +- drivers/usb/gadget/pxa25x_udc.c | 6 +++--- drivers/usb/gadget/pxa25x_udc.h | 2 +- drivers/usb/gadget/u_ether.c | 3 --- drivers/usb/host/isp116x-hcd.c | 2 +- drivers/usb/host/isp116x.h | 2 +- drivers/usb/host/sl811-hcd.c | 2 +- drivers/usb/host/sl811.h | 2 +- drivers/usb/misc/usbtest.c | 4 ++-- include/linux/usb/composite.h | 2 +- 28 files changed, 48 insertions(+), 55 deletions(-) diff -puN drivers/isdn/hisax/st5481.h~rename-warn-to-warning-to-clear-the-namespace drivers/isdn/hisax/st5481.h --- a/drivers/isdn/hisax/st5481.h~rename-warn-to-warning-to-clear-the-namespace +++ a/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; \ }) diff -puN drivers/isdn/hisax/st5481_b.c~rename-warn-to-warning-to-clear-the-namespace drivers/isdn/hisax/st5481_b.c --- a/drivers/isdn/hisax/st5481_b.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/isdn/hisax/st5481_b.c @@ -180,7 +180,7 @@ static void usb_b_out_complete(struct ur DBG(4,"urb killed status %d", urb->status); return; // Give up default: - WARN("urb status %d",urb->status); + WARNING("urb status %d",urb->status); if (b_out->busy == 0) { st5481_usb_pipe_reset(adapter, (bcs->channel+1)*2 | USB_DIR_OUT, NULL, NULL); } @@ -372,6 +372,6 @@ void st5481_b_l2l1(struct hisax_if *ifc, B_L1L2(bcs, PH_DEACTIVATE | INDICATION, NULL); break; default: - WARN("pr %#x\n", pr); + WARNING("pr %#x\n", pr); } } diff -puN drivers/isdn/hisax/st5481_d.c~rename-warn-to-warning-to-clear-the-namespace drivers/isdn/hisax/st5481_d.c --- a/drivers/isdn/hisax/st5481_d.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/isdn/hisax/st5481_d.c @@ -389,7 +389,7 @@ static void usb_d_out_complete(struct ur DBG(1,"urb killed status %d", urb->status); break; default: - WARN("urb status %d",urb->status); + WARNING("urb status %d",urb->status); if (d_out->busy == 0) { st5481_usb_pipe_reset(adapter, EP_D_OUT | USB_DIR_OUT, fifo_reseted, adapter); } @@ -420,7 +420,7 @@ static void dout_start_xmit(struct FsmIn isdnhdlc_out_init(&d_out->hdlc_state, 1, 0); if (test_and_set_bit(buf_nr, &d_out->busy)) { - WARN("ep %d urb %d busy %#lx", EP_D_OUT, buf_nr, d_out->busy); + WARNING("ep %d urb %d busy %#lx", EP_D_OUT, buf_nr, d_out->busy); return; } urb = d_out->urb[buf_nr]; @@ -601,7 +601,7 @@ void st5481_d_l2l1(struct hisax_if *hisa FsmEvent(&adapter->d_out.fsm, EV_DOUT_START_XMIT, NULL); break; default: - WARN("pr %#x\n", pr); + WARNING("pr %#x\n", pr); break; } } diff -puN drivers/isdn/hisax/st5481_usb.c~rename-warn-to-warning-to-clear-the-namespace drivers/isdn/hisax/st5481_usb.c --- a/drivers/isdn/hisax/st5481_usb.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/isdn/hisax/st5481_usb.c @@ -66,7 +66,7 @@ static void usb_ctrl_msg(struct st5481_a struct ctrl_msg *ctrl_msg; if ((w_index = fifo_add(&ctrl->msg_fifo.f)) < 0) { - WARN("control msg FIFO full"); + WARNING("control msg FIFO full"); return; } ctrl_msg = &ctrl->msg_fifo.data[w_index]; @@ -139,7 +139,7 @@ static void usb_ctrl_complete(struct urb DBG(1,"urb killed status %d", urb->status); return; // Give up default: - WARN("urb status %d",urb->status); + WARNING("urb status %d",urb->status); break; } } @@ -198,7 +198,7 @@ static void usb_int_complete(struct urb DBG(2, "urb shutting down with status: %d", urb->status); return; default: - WARN("nonzero urb status received: %d", urb->status); + WARNING("nonzero urb status received: %d", urb->status); goto exit; } @@ -235,7 +235,7 @@ static void usb_int_complete(struct urb exit: status = usb_submit_urb (urb, GFP_ATOMIC); if (status) - WARN("usb_submit_urb failed with result %d", status); + WARNING("usb_submit_urb failed with result %d", status); } /* ====================================================================== @@ -257,7 +257,7 @@ int st5481_setup_usb(struct st5481_adapt DBG(2,""); if ((status = usb_reset_configuration (dev)) < 0) { - WARN("reset_configuration failed,status=%d",status); + WARNING("reset_configuration failed,status=%d",status); return status; } @@ -269,7 +269,7 @@ int st5481_setup_usb(struct st5481_adapt // Check if the config is sane if ( altsetting->desc.bNumEndpoints != 7 ) { - WARN("expecting 7 got %d endpoints!", altsetting->desc.bNumEndpoints); + WARNING("expecting 7 got %d endpoints!", altsetting->desc.bNumEndpoints); return -EINVAL; } @@ -279,7 +279,7 @@ int st5481_setup_usb(struct st5481_adapt // Use alternative setting 3 on interface 0 to have 2B+D if ((status = usb_set_interface (dev, 0, 3)) < 0) { - WARN("usb_set_interface failed,status=%d",status); + WARNING("usb_set_interface failed,status=%d",status); return status; } @@ -497,7 +497,7 @@ static void usb_in_complete(struct urb * DBG(1,"urb killed status %d", urb->status); return; // Give up default: - WARN("urb status %d",urb->status); + WARNING("urb status %d",urb->status); break; } } @@ -523,7 +523,7 @@ static void usb_in_complete(struct urb * DBG(4,"count=%d",status); DBG_PACKET(0x400, in->rcvbuf, status); if (!(skb = dev_alloc_skb(status))) { - WARN("receive out of memory\n"); + WARNING("receive out of memory\n"); break; } memcpy(skb_put(skb, status), in->rcvbuf, status); diff -puN drivers/usb/gadget/ether.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/ether.c --- a/drivers/usb/gadget/ether.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/ether.c @@ -293,7 +293,7 @@ static int __init eth_bind(struct usb_co * but if the controller isn't recognized at all then * that assumption is a bit more likely to be wrong. */ - WARN(cdev, "controller '%s' not recognized; trying %s\n", + WARNING(cdev, "controller '%s' not recognized; trying %s\n", gadget->name, eth_config_driver.label); device_desc.bcdDevice = diff -puN drivers/usb/gadget/file_storage.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/file_storage.c --- a/drivers/usb/gadget/file_storage.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/file_storage.c @@ -308,7 +308,7 @@ MODULE_LICENSE("Dual BSD/GPL"); dev_vdbg(&(d)->gadget->dev , fmt , ## args) #define ERROR(d, fmt, args...) \ dev_err(&(d)->gadget->dev , fmt , ## args) -#define WARN(d, fmt, args...) \ +#define WARNING(d, fmt, args...) \ dev_warn(&(d)->gadget->dev , fmt , ## args) #define INFO(d, fmt, args...) \ dev_info(&(d)->gadget->dev , fmt , ## args) @@ -1091,7 +1091,7 @@ static int ep0_queue(struct fsg_dev *fsg if (rc != 0 && rc != -ESHUTDOWN) { /* We can't do much more than wait for a reset */ - WARN(fsg, "error in submission: %s --> %d\n", + WARNING(fsg, "error in submission: %s --> %d\n", fsg->ep0->name, rc); } return rc; @@ -1227,7 +1227,7 @@ static void received_cbi_adsc(struct fsg /* Save the command for later */ if (fsg->cbbuf_cmnd_size) - WARN(fsg, "CB[I] overwriting previous command\n"); + WARNING(fsg, "CB[I] overwriting previous command\n"); fsg->cbbuf_cmnd_size = req->actual; memcpy(fsg->cbbuf_cmnd, req->buf, fsg->cbbuf_cmnd_size); @@ -1506,7 +1506,7 @@ static void start_transfer(struct fsg_de * submissions if DMA is enabled. */ if (rc != -ESHUTDOWN && !(rc == -EOPNOTSUPP && req->length == 0)) - WARN(fsg, "error in submission: %s --> %d\n", + WARNING(fsg, "error in submission: %s --> %d\n", ep->name, rc); } } @@ -2294,7 +2294,7 @@ static int halt_bulk_in_endpoint(struct VDBG(fsg, "delayed bulk-in endpoint halt\n"); while (rc != 0) { if (rc != -EAGAIN) { - WARN(fsg, "usb_ep_set_halt -> %d\n", rc); + WARNING(fsg, "usb_ep_set_halt -> %d\n", rc); rc = 0; break; } @@ -2317,7 +2317,7 @@ static int wedge_bulk_in_endpoint(struct VDBG(fsg, "delayed bulk-in endpoint wedge\n"); while (rc != 0) { if (rc != -EAGAIN) { - WARN(fsg, "usb_ep_set_wedge -> %d\n", rc); + WARNING(fsg, "usb_ep_set_wedge -> %d\n", rc); rc = 0; break; } @@ -3755,7 +3755,7 @@ static int __init check_parameters(struc if (gcnum >= 0) mod_data.release = 0x0300 + gcnum; else { - WARN(fsg, "controller '%s' not recognized\n", + WARNING(fsg, "controller '%s' not recognized\n", fsg->gadget->name); mod_data.release = 0x0399; } diff -puN drivers/usb/gadget/fsl_usb2_udc.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/fsl_usb2_udc.c --- a/drivers/usb/gadget/fsl_usb2_udc.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/fsl_usb2_udc.c @@ -1538,7 +1538,7 @@ static void dtd_complete_irq(struct fsl_ /* If the ep is configured */ if (curr_ep->name == NULL) { - WARN("Invalid EP?"); + WARNING("Invalid EP?"); continue; } diff -puN drivers/usb/gadget/fsl_usb2_udc.h~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/fsl_usb2_udc.h --- a/drivers/usb/gadget/fsl_usb2_udc.h~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/fsl_usb2_udc.h @@ -552,7 +552,7 @@ static void dump_msg(const char *label, #endif #define ERR(stuff...) pr_err("udc: " stuff) -#define WARN(stuff...) pr_warning("udc: " stuff) +#define WARNING(stuff...) pr_warning("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff) /*-------------------------------------------------------------------------*/ diff -puN drivers/usb/gadget/gmidi.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/gmidi.c --- a/drivers/usb/gadget/gmidi.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/gmidi.c @@ -138,8 +138,6 @@ static void gmidi_transmit(struct gmidi_ dev_vdbg(&(d)->gadget->dev , fmt , ## args) #define ERROR(d, fmt, args...) \ dev_err(&(d)->gadget->dev , fmt , ## args) -#define WARN(d, fmt, args...) \ - dev_warn(&(d)->gadget->dev , fmt , ## args) #define INFO(d, fmt, args...) \ dev_info(&(d)->gadget->dev , fmt , ## args) diff -puN drivers/usb/gadget/goku_udc.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/goku_udc.c --- a/drivers/usb/gadget/goku_udc.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/goku_udc.c @@ -1768,7 +1768,7 @@ static int goku_probe(struct pci_dev *pd * usb_gadget_driver_{register,unregister}() must change. */ if (the_controller) { - WARN(dev, "ignoring %s\n", pci_name(pdev)); + WARNING(dev, "ignoring %s\n", pci_name(pdev)); return -EBUSY; } if (!pdev->irq) { diff -puN drivers/usb/gadget/goku_udc.h~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/goku_udc.h --- a/drivers/usb/gadget/goku_udc.h~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/goku_udc.h @@ -285,7 +285,7 @@ struct goku_udc { #define ERROR(dev,fmt,args...) \ xprintk(dev , KERN_ERR , fmt , ## args) -#define WARN(dev,fmt,args...) \ +#define WARNING(dev,fmt,args...) \ xprintk(dev , KERN_WARNING , fmt , ## args) #define INFO(dev,fmt,args...) \ xprintk(dev , KERN_INFO , fmt , ## args) diff -puN drivers/usb/gadget/inode.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/inode.c --- a/drivers/usb/gadget/inode.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/inode.c @@ -262,8 +262,6 @@ static const char *CHIP; #define ERROR(dev,fmt,args...) \ xprintk(dev , KERN_ERR , fmt , ## args) -#define WARN(dev,fmt,args...) \ - xprintk(dev , KERN_WARNING , fmt , ## args) #define INFO(dev,fmt,args...) \ xprintk(dev , KERN_INFO , fmt , ## args) diff -puN drivers/usb/gadget/net2280.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/net2280.c --- a/drivers/usb/gadget/net2280.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/net2280.c @@ -1007,7 +1007,7 @@ static void scan_dma_completions (struct * 0122, and 0124; not all cases trigger the warning. */ if ((tmp & (1 << NAK_OUT_PACKETS)) == 0) { - WARN (ep->dev, "%s lost packet sync!\n", + WARNING (ep->dev, "%s lost packet sync!\n", ep->ep.name); req->req.status = -EOVERFLOW; } else if ((tmp = readl (&ep->regs->ep_avail)) != 0) { diff -puN drivers/usb/gadget/net2280.h~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/net2280.h --- a/drivers/usb/gadget/net2280.h~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/net2280.h @@ -272,7 +272,7 @@ static inline void net2280_led_shutdown #define ERROR(dev,fmt,args...) \ xprintk(dev , KERN_ERR , fmt , ## args) -#define WARN(dev,fmt,args...) \ +#define WARNING(dev,fmt,args...) \ xprintk(dev , KERN_WARNING , fmt , ## args) #define INFO(dev,fmt,args...) \ xprintk(dev , KERN_INFO , fmt , ## args) diff -puN drivers/usb/gadget/omap_udc.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/omap_udc.c --- a/drivers/usb/gadget/omap_udc.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/omap_udc.c @@ -1129,7 +1129,7 @@ static int omap_ep_set_halt(struct usb_e status = -EINVAL; else if (value) { if (ep->udc->ep0_set_config) { - WARN("error changing config?\n"); + WARNING("error changing config?\n"); UDC_SYSCON2_REG = UDC_CLR_CFG; } UDC_SYSCON2_REG = UDC_STALL_CMD; @@ -1746,7 +1746,7 @@ do_stall: u.r.bRequestType, u.r.bRequest, status); if (udc->ep0_set_config) { if (udc->ep0_reset_config) - WARN("error resetting config?\n"); + WARNING("error resetting config?\n"); else UDC_SYSCON2_REG = UDC_CLR_CFG; } @@ -3052,7 +3052,7 @@ static int omap_udc_suspend(struct platf * which would prevent entry to deep sleep... */ if ((devstat & UDC_ATT) != 0 && (devstat & UDC_SUS) == 0) { - WARN("session active; suspend requires disconnect\n"); + WARNING("session active; suspend requires disconnect\n"); omap_pullup(&udc->gadget, 0); } diff -puN drivers/usb/gadget/omap_udc.h~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/omap_udc.h --- a/drivers/usb/gadget/omap_udc.h~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/omap_udc.h @@ -189,7 +189,7 @@ struct omap_udc { #endif #define ERR(stuff...) pr_err("udc: " stuff) -#define WARN(stuff...) pr_warning("udc: " stuff) +#define WARNING(stuff...) pr_warning("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff) #define DBG(stuff...) pr_debug("udc: " stuff) diff -puN /dev/null /dev/null diff -puN /dev/null /dev/null diff -puN drivers/usb/host/isp116x-hcd.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/host/isp116x-hcd.c --- a/drivers/usb/host/isp116x-hcd.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/host/isp116x-hcd.c @@ -867,7 +867,7 @@ static void isp116x_endpoint_disable(str for (i = 0; i < 100 && !list_empty(&hep->urb_list); i++) msleep(3); if (!list_empty(&hep->urb_list)) - WARN("ep %p not empty?\n", ep); + WARNING("ep %p not empty?\n", ep); kfree(ep); hep->hcpriv = NULL; diff -puN drivers/usb/host/isp116x.h~rename-warn-to-warning-to-clear-the-namespace drivers/usb/host/isp116x.h --- a/drivers/usb/host/isp116x.h~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/host/isp116x.h @@ -338,7 +338,7 @@ struct isp116x_ep { #endif #define ERR(stuff...) printk(KERN_ERR "116x: " stuff) -#define WARN(stuff...) printk(KERN_WARNING "116x: " stuff) +#define WARNING(stuff...) printk(KERN_WARNING "116x: " stuff) #define INFO(stuff...) printk(KERN_INFO "116x: " stuff) /* ------------------------------------------------- */ diff -puN drivers/usb/host/sl811-hcd.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/host/sl811-hcd.c --- a/drivers/usb/host/sl811-hcd.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/host/sl811-hcd.c @@ -1026,7 +1026,7 @@ sl811h_endpoint_disable(struct usb_hcd * if (!list_empty(&hep->urb_list)) msleep(3); if (!list_empty(&hep->urb_list)) - WARN("ep %p not empty?\n", ep); + WARNING("ep %p not empty?\n", ep); kfree(ep); hep->hcpriv = NULL; diff -puN drivers/usb/host/sl811.h~rename-warn-to-warning-to-clear-the-namespace drivers/usb/host/sl811.h --- a/drivers/usb/host/sl811.h~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/host/sl811.h @@ -261,6 +261,6 @@ sl811_read_buf(struct sl811 *sl811, int #endif #define ERR(stuff...) printk(KERN_ERR "sl811: " stuff) -#define WARN(stuff...) printk(KERN_WARNING "sl811: " stuff) +#define WARNING(stuff...) printk(KERN_WARNING "sl811: " stuff) #define INFO(stuff...) printk(KERN_INFO "sl811: " stuff) diff -puN drivers/usb/misc/usbtest.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/misc/usbtest.c --- a/drivers/usb/misc/usbtest.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/misc/usbtest.c @@ -81,7 +81,7 @@ static struct usb_device *testdev_to_usb #define ERROR(tdev, fmt, args...) \ dev_err(&(tdev)->intf->dev , fmt , ## args) -#define WARN(tdev, fmt, args...) \ +#define WARNING(tdev, fmt, args...) \ dev_warn(&(tdev)->intf->dev , fmt , ## args) /*-------------------------------------------------------------------------*/ @@ -1946,7 +1946,7 @@ usbtest_probe (struct usb_interface *int status = get_endpoints (dev, intf); if (status < 0) { - WARN(dev, "couldn't get endpoints, %d\n", + WARNING(dev, "couldn't get endpoints, %d\n", status); return status; } diff -puN drivers/usb/gadget/printer.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/printer.c --- a/drivers/usb/gadget/printer.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/printer.c @@ -179,7 +179,7 @@ module_param(qlen, uint, S_IRUGO|S_IWUSR #define ERROR(dev, fmt, args...) \ xprintk(dev, KERN_ERR, fmt, ## args) -#define WARN(dev, fmt, args...) \ +#define WARNING(dev, fmt, args...) \ xprintk(dev, KERN_WARNING, fmt, ## args) #define INFO(dev, fmt, args...) \ xprintk(dev, KERN_INFO, fmt, ## args) diff -puN drivers/usb/gadget/pxa25x_udc.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/pxa25x_udc.c --- a/drivers/usb/gadget/pxa25x_udc.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/pxa25x_udc.c @@ -340,7 +340,7 @@ pxa25x_ep_free_request (struct usb_ep *_ struct pxa25x_request *req; req = container_of (_req, struct pxa25x_request, req); - WARN_ON (!list_empty (&req->queue)); + WARN_ON(!list_empty (&req->queue)); kfree(req); } @@ -1554,7 +1554,7 @@ config_change: * tell us about config change events, * so later ones may fail... */ - WARN("config change %02x fail %d?\n", + WARNING("config change %02x fail %d?\n", u.r.bRequest, i); return; /* TODO experiment: if has_cfr, @@ -2328,7 +2328,7 @@ static int pxa25x_udc_suspend(struct pla unsigned long flags; if (!udc->mach->gpio_pullup && !udc->mach->udc_command) - WARN("USB host won't detect disconnect!\n"); + WARNING("USB host won't detect disconnect!\n"); udc->suspended = 1; local_irq_save(flags); diff -puN drivers/usb/gadget/cdc2.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/cdc2.c --- a/drivers/usb/gadget/cdc2.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/cdc2.c @@ -170,7 +170,7 @@ static int __init cdc_bind(struct usb_co * but if the controller isn't recognized at all then * that assumption is a bit more likely to be wrong. */ - WARN(cdev, "controller '%s' not recognized; trying %s\n", + WARNING(cdev, "controller '%s' not recognized; trying %s\n", gadget->name, cdc_config_driver.label); device_desc.bcdDevice = diff -puN drivers/usb/gadget/u_ether.c~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/u_ether.c --- a/drivers/usb/gadget/u_ether.c~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/u_ether.c @@ -116,7 +116,6 @@ static inline int qlen(struct usb_gadget #undef DBG #undef VDBG #undef ERROR -#undef WARN #undef INFO #define xprintk(d, level, fmt, args...) \ @@ -140,8 +139,6 @@ static inline int qlen(struct usb_gadget #define ERROR(dev, fmt, args...) \ xprintk(dev , KERN_ERR , fmt , ## args) -#define WARN(dev, fmt, args...) \ - xprintk(dev , KERN_WARNING , fmt , ## args) #define INFO(dev, fmt, args...) \ xprintk(dev , KERN_INFO , fmt , ## args) diff -puN drivers/usb/gadget/at91_udc.h~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/at91_udc.h --- a/drivers/usb/gadget/at91_udc.h~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/at91_udc.h @@ -171,7 +171,7 @@ struct at91_request { #endif #define ERR(stuff...) pr_err("udc: " stuff) -#define WARN(stuff...) pr_warning("udc: " stuff) +#define WARNING(stuff...) pr_warning("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff) #define DBG(stuff...) pr_debug("udc: " stuff) diff -puN drivers/usb/gadget/pxa25x_udc.h~rename-warn-to-warning-to-clear-the-namespace drivers/usb/gadget/pxa25x_udc.h --- a/drivers/usb/gadget/pxa25x_udc.h~rename-warn-to-warning-to-clear-the-namespace +++ a/drivers/usb/gadget/pxa25x_udc.h @@ -259,7 +259,7 @@ dump_state(struct pxa25x_udc *dev) #define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0) #define ERR(stuff...) pr_err("udc: " stuff) -#define WARN(stuff...) pr_warning("udc: " stuff) +#define WARNING(stuff...) pr_warning("udc: " stuff) #define INFO(stuff...) pr_info("udc: " stuff) diff -puN include/linux/usb/composite.h~rename-warn-to-warning-to-clear-the-namespace include/linux/usb/composite.h --- a/include/linux/usb/composite.h~rename-warn-to-warning-to-clear-the-namespace +++ a/include/linux/usb/composite.h @@ -330,7 +330,7 @@ extern int usb_string_id(struct usb_comp dev_vdbg(&(d)->gadget->dev , fmt , ## args) #define ERROR(d, fmt, args...) \ dev_err(&(d)->gadget->dev , fmt , ## args) -#define WARN(d, fmt, args...) \ +#define WARNING(d, fmt, args...) \ dev_warn(&(d)->gadget->dev , fmt , ## args) #define INFO(d, fmt, args...) \ dev_info(&(d)->gadget->dev , fmt , ## args) _