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

Commit 3b6004f3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: remove warn() macro from usb drivers 



USB should not be having it's own printk macros, so remove warn() and
use the system-wide standard of dev_warn() wherever possible.  In the
few places that will not work out, use a basic printk().

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4dc89948

drivers/usb/atm/usbatm.c

+5 −5
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char 
				__func__, sarb->len, vcc);

		/* discard cells already received */

		skb_trim(sarb, 0);

		UDSL_ASSERT(sarb->tail + ATM_CELL_PAYLOAD <= sarb->end);

		UDSL_ASSERT(instance, sarb->tail + ATM_CELL_PAYLOAD <= sarb->end);

	}



	memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);
@@ -432,7 +432,7 @@ static void usbatm_extract_cells(struct usbatm_data *instance, 
		unsigned char *cell_buf = instance->cell_buf;

		unsigned int space_left = stride - buf_usage;



		UDSL_ASSERT(buf_usage <= stride);

		UDSL_ASSERT(instance, buf_usage <= stride);



		if (avail_data >= space_left) {

			/* add new data and process cell */
@@ -475,7 +475,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance, 
	unsigned int stride = instance->tx_channel.stride;



	vdbg("%s: skb->len=%d, avail_space=%u", __func__, skb->len, avail_space);

	UDSL_ASSERT(!(avail_space % stride));

	UDSL_ASSERT(instance, !(avail_space % stride));



	for (bytes_written = 0; bytes_written < avail_space && ctrl->len;

	     bytes_written += stride, target += stride) {
@@ -547,7 +547,7 @@ static void usbatm_rx_process(unsigned long data) 
				if (!urb->iso_frame_desc[i].status) {

					unsigned int actual_length = urb->iso_frame_desc[i].actual_length;



					UDSL_ASSERT(actual_length <= packet_size);

					UDSL_ASSERT(instance, actual_length <= packet_size);



					if (!merge_length)

						merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
@@ -1188,7 +1188,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id, 
		struct urb *urb;

		unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0;



		UDSL_ASSERT(!usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint));

		UDSL_ASSERT(instance, !usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint));



		urb = usb_alloc_urb(iso_packets, GFP_KERNEL);

		if (!urb) {

drivers/usb/atm/usbatm.h

+8 −2
Original line number Diff line number Diff line
@@ -40,9 +40,15 @@ 
*/



#ifdef DEBUG

#define UDSL_ASSERT(x)	BUG_ON(!(x))

#define UDSL_ASSERT(instance, x)	BUG_ON(!(x))

#else

#define UDSL_ASSERT(x)	do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)

#define UDSL_ASSERT(instance, x)					\

	do {	\

		if (!(x))						\

			dev_warn(&(instance)->usb_intf->dev,		\

				 "failed assertion '%s' at line %d",	\

				 __stringify(x), __LINE__);		\

	} while(0)

#endif



#define usb_err(instance, format, arg...)	\

drivers/usb/atm/xusbatm.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int __init xusbatm_init(void) 
	    num_vendor != num_product ||

	    num_vendor != num_rx_endpoint ||

	    num_vendor != num_tx_endpoint) {

		warn("malformed module parameters");

		printk(KERN_WARNING "xusbatm: malformed module parameters\n");

		return -EINVAL;

	}

drivers/usb/core/devio.c

+2 −1
Original line number Diff line number Diff line
@@ -413,7 +413,8 @@ static void driver_disconnect(struct usb_interface *intf) 
	if (likely(ifnum < 8*sizeof(ps->ifclaimed)))

		clear_bit(ifnum, &ps->ifclaimed);

	else

		warn("interface number %u out of range", ifnum);

		dev_warn(&intf->dev, "interface number %u out of range\n",

			 ifnum);



	usb_set_intfdata(intf, NULL);

drivers/usb/core/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -240,7 +240,9 @@ static void update_sb(struct super_block *sb) 
				update_special(bus);

				break;

			default:

				warn("Unknown node %s mode %x found on remount!\n",bus->d_name.name,bus->d_inode->i_mode);

				printk(KERN_WARNING "usbfs: Unknown node %s "

				       "mode %x found on remount!\n",

				       bus->d_name.name, bus->d_inode->i_mode);

				break;

			}

		}
@@ -259,7 +261,7 @@ static int remount(struct super_block *sb, int *flags, char *data) 
		return 0;



	if (parse_options(sb, data)) {

		warn("usbfs: mount parameter error:");

		printk(KERN_WARNING "usbfs: mount parameter error.\n");

		return -EINVAL;

	}