Commit d617bc83 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: cleanup for previous patches 



This patch (as951) cleans up a few loose ends from earlier patches.
Redundant checks for non-NULL urb->dev are removed, as are checks of
urb->dev->bus (which can never be NULL).  Conversely, a check for
non-NULL urb->ep is added to the unlink paths.

A homegrown round-down-to-power-of-2 loop is simplified by using the
ilog2 routine.  The comparison in usb_urb_dir_in() is made more
transparent.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 18ea5d00

drivers/usb/core/hcd.c

+0 −5
Original line number Diff line number Diff line
@@ -1074,11 +1074,6 @@ int usb_hcd_unlink_urb (struct urb *urb, int status) 
	struct list_head		*tmp;

	int				retval;



	if (!urb)

		return -EINVAL;

	if (!urb->dev || !urb->dev->bus)

		return -ENODEV;



	/*

	 * we contend for urb->status with the hcd core,

	 * which changes it while returning the urb.

drivers/usb/core/urb.c

+7 −6
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/bitops.h>

#include <linux/slab.h>

#include <linux/init.h>

#include <linux/log2.h>

#include <linux/usb.h>

#include <linux/wait.h>

#include "hcd.h"
@@ -441,10 +442,8 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) 
		default:

			return -EINVAL;

		}

		/* power of two? */

		while (max > urb->interval)

			max >>= 1;

		urb->interval = max;

		/* Round down to a power of 2, no more than max */

		urb->interval = min(max, 1 << ilog2(urb->interval));

	}



	return usb_hcd_submit_urb(urb, mem_flags);
@@ -513,8 +512,10 @@ int usb_unlink_urb(struct urb *urb) 
{

	if (!urb)

		return -EINVAL;

	if (!(urb->dev && urb->dev->bus))

	if (!urb->dev)

		return -ENODEV;

	if (!urb->ep)

		return -EIDRM;

	return usb_hcd_unlink_urb(urb, -ECONNRESET);

}
@@ -541,7 +542,7 @@ int usb_unlink_urb(struct urb *urb) 
void usb_kill_urb(struct urb *urb)

{

	might_sleep();

	if (!(urb && urb->dev && urb->dev->bus))

	if (!(urb && urb->dev && urb->ep))

		return;

	spin_lock_irq(&urb->lock);

	++urb->reject;

include/linux/usb.h

+1 −1
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ extern int usb_wait_anchor_empty_timeout(struct usb_anchor *anchor, 
 */

static inline int usb_urb_dir_in(struct urb *urb)

{

	return (urb->transfer_flags & URB_DIR_MASK) != URB_DIR_OUT;

	return (urb->transfer_flags & URB_DIR_MASK) == URB_DIR_IN;

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE