[PATCH v4 1/1] USB: core: let USB device know device node

On Fri, 5 Feb 2016, Peter Chen wrote:

quoted

quoted

quoted

@@ -508,11 +509,20 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
    dev->connect_time = jiffies;
    dev->active_duration = -jiffies;
 #endif
-   if (root_hub)   /* Root hub always ok [and always wired] */
+   if (root_hub) { /* Root hub always ok [and always wired] */
            dev->authorized = 1;
-   else {
+           dev->dev.of_node = bus->controller->of_node;
+   } else {
            dev->authorized = !!HCD_DEV_AUTHORIZED(usb_hcd);
            dev->wusb = usb_bus_is_wusb(bus) ? 1 : 0;
+
+           if (dev->dev.parent->parent == bus->controller)
+                   /* device under root hub's port */
+                   port1 = usb_hcd_find_raw_port_number(usb_hcd,
+                           port1);

I would change the test to "if (!parent->parent)" and add {} around the
body (since it's 3 lines long).  Also, although this doesn't really
matter, you could consider putting the new code inside the previous big
"if" statement instead of down here at the end of the function.

Sorry, Alan, I can understand using (!parent->parent) to stands for
the device connects to the root hub port, others I can't understand.

Change it to

+		if (!parent->parent) {
+			/* device under root hub's port */
+			port1 = usb_hcd_find_raw_port_number(usb_hcd,
+				port1);
+		}

That is, add braces { }.
          
If you look at the whole usb_alloc_dev() function, you'll see it has
one big "if" statement and then a small "if" statement near the end.  
You added your new code to the small "if" statement; I'm suggesting you
add it into the big "if" statement instead.

Alan Stern