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

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

USB: usbatm: remove unused UDSL_ASSERT macro 



If this code isn't triggering this assert by now, it never will, so just
remove it, it's pointless.

Cc: Duncan Sands <duncan.sands@free.fr>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7ece651

drivers/usb/atm/usbatm.c

+0 −8
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ 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(instance, sarb->tail + ATM_CELL_PAYLOAD <= sarb->end);

	}



	memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);
@@ -437,8 +436,6 @@ 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(instance, buf_usage <= stride);



		if (avail_data >= space_left) {

			/* add new data and process cell */

			memcpy(cell_buf + buf_usage, source, space_left);
@@ -481,7 +478,6 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance, 


	vdbg(&instance->usb_intf->dev, "%s: skb->len=%d, avail_space=%u",

	     __func__, skb->len, avail_space);

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



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

	     bytes_written += stride, target += stride) {
@@ -553,8 +549,6 @@ 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(instance, actual_length <= packet_size);



					if (!merge_length)

						merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset;

					merge_length += actual_length;
@@ -1176,8 +1170,6 @@ 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(instance, !usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint));



		urb = usb_alloc_urb(iso_packets, GFP_KERNEL);

		if (!urb) {

			dev_err(dev, "%s: no memory for urb %d!\n", __func__, i);

drivers/usb/atm/usbatm.h

+0 −12
Original line number Diff line number Diff line
@@ -39,18 +39,6 @@ 
#define VERBOSE_DEBUG

*/



#ifdef DEBUG

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

#else

#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...)	\

	dev_err(&(instance)->usb_intf->dev , format , ## arg)

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