---

yaml
---
r: 354598
b: refs/heads/master
c: 5da9347
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 468234984f7bce270484d833899cd8ed4d61e885
+refs/heads/master: 5da93478251cf0dd6b34874c7c1c24a4a52eabc1

trunk/Documentation/ABI/testing/sysfs-bus-usb

@@ -227,12 +227,3 @@ Contact:	Lan Tianyu <tianyu.lan@intel.com>
 Description:
 		The /sys/bus/usb/devices/.../(hub interface)/portX
 		is usb port device's sysfs directory.
-
-What:		/sys/bus/usb/devices/.../(hub interface)/portX/connect_type
-Date:		January 2013
-Contact:	Lan Tianyu <tianyu.lan@intel.com>
-Description:
-		Some platforms provide usb port connect types through ACPI.
-		This attribute is to expose these information to user space.
-		The file will read "hotplug", "wired" and "not used" if the
-		information is available, and "unknown" otherwise.

trunk/drivers/usb/c67x00/c67x00-ll-hpi.c

@@ -237,7 +237,7 @@ void c67x00_ll_hpi_disable_sofeop(struct c67x00_sie *sie)
 /* -------------------------------------------------------------------------- */
 /* Transactions */
 
-static inline int ll_recv_msg(struct c67x00_device *dev)
+static inline u16 ll_recv_msg(struct c67x00_device *dev)
 {
 	u16 res;
 

trunk/drivers/usb/chipidea/core.c

@@ -411,7 +411,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 	}
 
 	base = devm_request_and_ioremap(dev, res);
-	if (!base) {
+	if (!res) {
 		dev_err(dev, "can't request and ioremap resource\n");
 		return -ENOMEM;
 	}

trunk/drivers/usb/core/Makefile

@@ -7,7 +7,6 @@ ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
 usbcore-y := usb.o hub.o hcd.o urb.o message.o driver.o
 usbcore-y += config.o file.o buffer.o sysfs.o endpoint.o
 usbcore-y += devio.o notify.o generic.o quirks.o devices.o
-usbcore-y += port.o
 
 usbcore-$(CONFIG_PCI)		+= hcd-pci.o
 usbcore-$(CONFIG_ACPI)		+= usb-acpi.o

trunk/drivers/usb/core/devices.c

@@ -316,23 +316,17 @@ static char *usb_dump_iad_descriptor(char *start, char *end,
  */
 static char *usb_dump_config_descriptor(char *start, char *end,
 				const struct usb_config_descriptor *desc,
-				int active, int speed)
+				int active)
 {
-	int mul;
-
 	if (start > end)
 		return start;
-	if (speed == USB_SPEED_SUPER)
-		mul = 8;
-	else
-		mul = 2;
 	start += sprintf(start, format_config,
 			 /* mark active/actual/current cfg. */
 			 active ? '*' : ' ',
 			 desc->bNumInterfaces,
 			 desc->bConfigurationValue,
 			 desc->bmAttributes,
-			 desc->bMaxPower * mul);
+			 desc->bMaxPower * 2);
 	return start;
 }
 
@@ -348,8 +342,7 @@ static char *usb_dump_config(int speed, char *start, char *end,
 	if (!config)
 		/* getting these some in 2.3.7; none in 2.3.6 */
 		return start + sprintf(start, "(null Cfg. desc.)\n");
-	start = usb_dump_config_descriptor(start, end, &config->desc, active,
-			speed);
+	start = usb_dump_config_descriptor(start, end, &config->desc, active);
 	for (i = 0; i < USB_MAXIADS; i++) {
 		if (config->intf_assoc[i] == NULL)
 			break;

trunk/drivers/usb/core/generic.c

@@ -100,7 +100,7 @@ int usb_choose_configuration(struct usb_device *udev)
 		 */
 
 		/* Rule out configs that draw too much bus current */
-		if (usb_get_max_power(udev, c) > udev->bus_mA) {
+		if (c->desc.bMaxPower * 2 > udev->bus_mA) {
 			insufficient_power++;
 			continue;
 		}

trunk/drivers/usb/core/hcd.c

@@ -619,10 +619,6 @@ static int rh_call_control (struct usb_hcd *hcd, struct urb *urb)
 		status = hcd->driver->hub_control (hcd,
 			typeReq, wValue, wIndex,
 			tbuf, wLength);
-
-		if (typeReq == GetHubDescriptor)
-			usb_hub_adjust_deviceremovable(hcd->self.root_hub,
-				(struct usb_hub_descriptor *)tbuf);
 		break;
 error:
 		/* "protocol stall" on error */
@@ -2510,6 +2506,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
 	}
 
 	/* starting here, usbcore will pay attention to this root hub */
+	rhdev->bus_mA = min(500u, hcd->power_budget);
 	if ((retval = register_root_hub(hcd)) != 0)
 		goto err_register_root_hub;