Commit a2cdc343 authored by Dan Williams's avatar Dan Williams Committed by Sarah Sharp
Browse files

usb: xhci: remove the unused ->address field 



Only used for debug output, so we don't need to save it.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent 4e341818

drivers/usb/host/xhci.c

+2 −8
Original line number Diff line number Diff line
@@ -3704,9 +3704,6 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev) 
 * the device).

 * We should be protected by the usb_address0_mutex in khubd's hub_port_init, so

 * we should only issue and wait on one address command at the same time.

 *

 * We add one to the device address issued by the hardware because the USB core

 * uses address 1 for the root hubs (even though they're not really devices).

 */

int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)

{
@@ -3851,16 +3848,13 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev) 
	slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->out_ctx);

	trace_xhci_address_ctx(xhci, virt_dev->out_ctx,

				slot_ctx->dev_info >> 27);

	/* Use kernel assigned address for devices; store xHC assigned

	 * address locally. */

	virt_dev->address = (le32_to_cpu(slot_ctx->dev_state) & DEV_ADDR_MASK)

		+ 1;

	/* Zero the input context control for later use */

	ctrl_ctx->add_flags = 0;

	ctrl_ctx->drop_flags = 0;



	xhci_dbg_trace(xhci, trace_xhci_dbg_address,

			"Internal device address = %d", virt_dev->address);

		       "Internal device address = %d",

		       le32_to_cpu(slot_ctx->dev_state) & DEV_ADDR_MASK);



	return 0;

}

drivers/usb/host/xhci.h

+0 −2
Original line number Diff line number Diff line
@@ -935,8 +935,6 @@ struct xhci_virt_device { 
	/* Rings saved to ensure old alt settings can be re-instated */

	struct xhci_ring		**ring_cache;

	int				num_rings_cached;

	/* Store xHC assigned device address */

	int				address;

#define	XHCI_MAX_RINGS_CACHED	31

	struct xhci_virt_ep		eps[31];

	struct completion		cmd_completion;