Mathias Nyman <mathias.nyman@xxxxxxxxxxxxxxx> writes: > From: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > > This should allow xhci to remove handling of platform data. > > Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > Cc: Felipe Balbi <balbi@xxxxxx> Cc: Felipe Balbi <felipe.balbi@xxxxxxxxxxxxxxx> Acked-by: Felipe Balbi <felipe.balbi@xxxxxxxxxxxxxxx> > Signed-off-by: Mathias Nyman <mathias.nyman@xxxxxxxxxxxxxxx> > --- > drivers/usb/dwc3/host.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c > index c679f63..67f90d7 100644 > --- a/drivers/usb/dwc3/host.c > +++ b/drivers/usb/dwc3/host.c > @@ -16,14 +16,13 @@ > */ > > #include <linux/platform_device.h> > -#include <linux/usb/xhci_pdriver.h> > > #include "core.h" > > int dwc3_host_init(struct dwc3 *dwc) > { > + struct property_entry props[2]; > struct platform_device *xhci; > - struct usb_xhci_pdata pdata; > int ret; > > xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO); > @@ -47,14 +46,15 @@ int dwc3_host_init(struct dwc3 *dwc) > goto err1; > } > > - memset(&pdata, 0, sizeof(pdata)); > + memset(props, 0, sizeof(struct property_entry) * ARRAY_SIZE(props)); > > - pdata.usb3_lpm_capable = dwc->usb3_lpm_capable; > - > - ret = platform_device_add_data(xhci, &pdata, sizeof(pdata)); > - if (ret) { > - dev_err(dwc->dev, "couldn't add platform data to xHCI device\n"); > - goto err1; > + if (dwc->usb3_lpm_capable) { > + props[0].name = "usb3-lpm-capable"; > + ret = platform_device_add_properties(xhci, props); > + if (ret) { > + dev_err(dwc->dev, "failed to add properties to xHCI\n"); > + goto err1; > + } > } > > phy_create_lookup(dwc->usb2_generic_phy, "usb2-phy", > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- balbi
Attachment:
signature.asc
Description: PGP signature