Skip to content

Commit

Permalink
Rename WARN() to WARNING() to clear the namespace
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Arjan van de Ven authored and Linus Torvalds committed Jul 25, 2008
1 parent f38954c commit b6c6393
Show file tree
Hide file tree
Showing 28 changed files with 48 additions and 55 deletions.
4 changes: 2 additions & 2 deletions drivers/isdn/hisax/st5481.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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...) \
Expand Down Expand Up @@ -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; \
})
Expand Down
4 changes: 2 additions & 2 deletions drivers/isdn/hisax/st5481_b.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ static void usb_b_out_complete(struct urb *urb)
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);
}
Expand Down Expand Up @@ -372,6 +372,6 @@ void st5481_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
B_L1L2(bcs, PH_DEACTIVATE | INDICATION, NULL);
break;
default:
WARN("pr %#x\n", pr);
WARNING("pr %#x\n", pr);
}
}
6 changes: 3 additions & 3 deletions drivers/isdn/hisax/st5481_d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ static void usb_d_out_complete(struct urb *urb)
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);
}
Expand Down Expand Up @@ -420,7 +420,7 @@ static void dout_start_xmit(struct FsmInst *fsm, int event, void *arg)
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];
Expand Down Expand Up @@ -601,7 +601,7 @@ void st5481_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
FsmEvent(&adapter->d_out.fsm, EV_DOUT_START_XMIT, NULL);
break;
default:
WARN("pr %#x\n", pr);
WARNING("pr %#x\n", pr);
break;
}
}
Expand Down
18 changes: 9 additions & 9 deletions drivers/isdn/hisax/st5481_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static void usb_ctrl_msg(struct st5481_adapter *adapter,
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];
Expand Down Expand Up @@ -139,7 +139,7 @@ static void usb_ctrl_complete(struct urb *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;
}
}
Expand Down Expand Up @@ -198,7 +198,7 @@ static void usb_int_complete(struct urb *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;
}

Expand Down Expand Up @@ -235,7 +235,7 @@ static void usb_int_complete(struct urb *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);
}

/* ======================================================================
Expand All @@ -257,7 +257,7 @@ int st5481_setup_usb(struct st5481_adapter *adapter)
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;
}

Expand All @@ -269,7 +269,7 @@ int st5481_setup_usb(struct st5481_adapter *adapter)

// 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;
}

Expand All @@ -279,7 +279,7 @@ int st5481_setup_usb(struct st5481_adapter *adapter)

// 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;
}

Expand Down Expand Up @@ -497,7 +497,7 @@ static void usb_in_complete(struct urb *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;
}
}
Expand All @@ -523,7 +523,7 @@ static void usb_in_complete(struct urb *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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/at91_udc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/cdc2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
* 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 =
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/ether.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int __init eth_bind(struct usb_composite_dev *cdev)
* 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 =
Expand Down
14 changes: 7 additions & 7 deletions drivers/usb/gadget/file_storage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1227,7 +1227,7 @@ static void received_cbi_adsc(struct fsg_dev *fsg, struct fsg_buffhd *bh)

/* 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);

Expand Down Expand Up @@ -1506,7 +1506,7 @@ static void start_transfer(struct fsg_dev *fsg, struct usb_ep *ep,
* 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);
}
}
Expand Down Expand Up @@ -2294,7 +2294,7 @@ static int halt_bulk_in_endpoint(struct fsg_dev *fsg)
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;
}
Expand All @@ -2317,7 +2317,7 @@ static int wedge_bulk_in_endpoint(struct fsg_dev *fsg)
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;
}
Expand Down Expand Up @@ -3755,7 +3755,7 @@ static int __init check_parameters(struct fsg_dev *fsg)
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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/fsl_usb2_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,7 @@ static void dtd_complete_irq(struct fsl_udc *udc)

/* If the ep is configured */
if (curr_ep->name == NULL) {
WARN("Invalid EP?");
WARNING("Invalid EP?");
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/fsl_usb2_udc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length)
#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)

/*-------------------------------------------------------------------------*/
Expand Down
2 changes: 0 additions & 2 deletions drivers/usb/gadget/gmidi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ static void gmidi_transmit(struct gmidi_device* dev, struct usb_request* req);
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)

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/goku_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
* 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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/goku_udc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions drivers/usb/gadget/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/net2280.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ static void scan_dma_completions (struct net2280_ep *ep)
* 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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/net2280.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ static inline void net2280_led_shutdown (struct net2280 *dev)

#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)
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/gadget/omap_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ static int omap_ep_set_halt(struct usb_ep *_ep, int value)
status = -EINVAL;
else if (value) {
if (ep->udc->ep0_set_config) {
WARN("error changing config?\n");
WARNING("error changing config?\n");
omap_writew(UDC_CLR_CFG, UDC_SYSCON2);
}
omap_writew(UDC_STALL_CMD, UDC_SYSCON2);
Expand Down Expand Up @@ -1764,7 +1764,7 @@ static void ep0_irq(struct omap_udc *udc, u16 irq_src)
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
omap_writew(UDC_CLR_CFG, UDC_SYSCON2);
}
Expand Down Expand Up @@ -3076,7 +3076,7 @@ static int omap_udc_suspend(struct platform_device *dev, pm_message_t message)
* 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);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/omap_udc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,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)

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/printer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/gadget/pxa25x_udc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ pxa25x_ep_free_request (struct usb_ep *_ep, struct usb_request *_req)
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);
}

Expand Down Expand Up @@ -1556,7 +1556,7 @@ static void handle_ep0 (struct pxa25x_udc *dev)
* 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,
Expand Down Expand Up @@ -2330,7 +2330,7 @@ static int pxa25x_udc_suspend(struct platform_device *dev, pm_message_t state)
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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/pxa25x_udc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
Loading

0 comments on commit b6c6393

Please sign in to comment.