]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: dwc3: host: use build-in property instead of platform data
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>
Tue, 21 Jun 2016 07:58:09 +0000 (10:58 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Jun 2016 18:43:39 +0000 (11:43 -0700)
This should allow xhci to remove handling of platform data.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/host.c

index c679f63783aec8c1a0fe4e43bef80546a55abf44..67f90d7c989de566b1101b324f9999dc595bfb79 100644 (file)
  */
 
 #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",