Commit a4204ff0 authored by Dan Williams's avatar Dan Williams Committed by Greg Kroah-Hartman
Browse files

usb: cleanup setting udev->removable from port_dev->connect_type 



Once usb-acpi has set the port's connect type the usb_device's
->removable attribute can be set in the standard location
set_usb_port_removable().

This also changes behavior in the case where the firmware says that the
port connect type is unknown.  In that case just use the default setting
determined from the hub descriptor.

Note, we no longer pass udev->portnum to acpi_find_child_device() in the
root hub case since:
1/ the usb-core sets this to zero
2/ acpi always expects zero
...just pass zero.

Suggested-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d99f6b41

drivers/usb/core/hub.c

+17 −5
Original line number Diff line number Diff line
@@ -2305,6 +2305,22 @@ static void set_usb_port_removable(struct usb_device *udev) 
		udev->removable = USB_DEVICE_REMOVABLE;

	else

		udev->removable = USB_DEVICE_FIXED;



	/*

	 * Platform firmware may have populated an alternative value for

	 * removable.  If the parent port has a known connect_type use

	 * that instead.

	 */

	switch (hub->ports[udev->portnum - 1]->connect_type) {

	case USB_PORT_CONNECT_TYPE_HOT_PLUG:

		udev->removable = USB_DEVICE_REMOVABLE;

		break;

	case USB_PORT_CONNECT_TYPE_HARD_WIRED:

		udev->removable = USB_DEVICE_FIXED;

		break;

	default: /* use what was set above */

		break;

	}

}



/**
@@ -2374,11 +2390,7 @@ int usb_new_device(struct usb_device *udev) 


	device_enable_async_suspend(&udev->dev);



	/*

	 * check whether the hub marks this port as non-removable. Do it

	 * now so that platform-specific data can override it in

	 * device_add()

	 */

	/* check whether the hub or firmware marks this port as non-removable */

	if (udev->parent)

		set_usb_port_removable(udev);

drivers/usb/core/usb-acpi.c

+6 −28
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ out: 


static struct acpi_device *usb_acpi_find_companion(struct device *dev)

{

	int port1;

	struct usb_device *udev;

	struct acpi_device *adev;

	acpi_handle *parent_handle;



	/*
@@ -155,40 +155,18 @@ static struct acpi_device *usb_acpi_find_companion(struct device *dev) 
	 */

	if (is_usb_device(dev)) {

		udev = to_usb_device(dev);

		port1 = udev->portnum;

		if (udev->parent) {

			struct usb_hub *hub;



			hub = usb_hub_to_struct_hub(udev->parent);

			/*

			 * According usb port's connect type to set usb device's

			 * removability.

			 */

			switch (hub->ports[port1 - 1]->connect_type) {

			case USB_PORT_CONNECT_TYPE_HOT_PLUG:

				udev->removable = USB_DEVICE_REMOVABLE;

				break;

			case USB_PORT_CONNECT_TYPE_HARD_WIRED:

				udev->removable = USB_DEVICE_FIXED;

				break;

			default:

				udev->removable = USB_DEVICE_REMOVABLE_UNKNOWN;

				break;

			}



		if (udev->parent)

			return NULL;

		}



		/* root hub's parent is the usb hcd. */

		return acpi_find_child_device(ACPI_COMPANION(dev->parent),

				port1, false);

		/* root hub is only child (_ADR=0) under its parent, the HC */

		adev = ACPI_COMPANION(dev->parent);

		return acpi_find_child_device(adev, 0, false);

	} else if (is_usb_port(dev)) {

		struct usb_port *port_dev = to_usb_port(dev);

		struct acpi_device *adev = NULL;

		int port1 = port_dev->portnum;



		/* Get the struct usb_device point of port's hub */

		udev = to_usb_device(dev->parent->parent);

		port1 = port_dev->portnum;



		/*

		 * The root hub ports' parent is the root hub. The non-root-hub

CRA Git | Maintained and supported by SUSTech CRA and CCSE