Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6c63937 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

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: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarGreg KH <greg@kroah.com>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f38954c9

drivers/isdn/hisax/st5481.h

+2 −2
Original line number Diff line number Diff line
@@ -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; \

})

drivers/isdn/hisax/st5481_b.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

				}
@@ -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);

	}

}

drivers/isdn/hisax/st5481_d.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

				}
@@ -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];
@@ -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;

	}

}

drivers/isdn/hisax/st5481_usb.c

+9 −9
Original line number Diff line number Diff line
@@ -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];
@@ -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;

		}

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

	}
@@ -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);

}



/* ======================================================================
@@ -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;

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

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

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

		}

	}
@@ -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);

drivers/usb/gadget/at91_udc.h

+1 −1
Original line number Diff line number Diff line
@@ -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)