Merge "usb: host: xhci: Add helper function to return controller id"