Browse Source

usb: dwc3: host: use build-in property instead of platform data

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>
Heikki Krogerus 9 years ago
parent
commit
95b57df450
1 changed files with 9 additions and 9 deletions
  1. 9 9
      drivers/usb/dwc3/host.c

+ 9 - 9
drivers/usb/dwc3/host.c

@@ -16,14 +16,13 @@
  */
  */
 
 
 #include <linux/platform_device.h>
 #include <linux/platform_device.h>
-#include <linux/usb/xhci_pdriver.h>
 
 
 #include "core.h"
 #include "core.h"
 
 
 int dwc3_host_init(struct dwc3 *dwc)
 int dwc3_host_init(struct dwc3 *dwc)
 {
 {
+	struct property_entry	props[2];
 	struct platform_device	*xhci;
 	struct platform_device	*xhci;
-	struct usb_xhci_pdata	pdata;
 	int			ret;
 	int			ret;
 
 
 	xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);
 	xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);
@@ -47,14 +46,15 @@ int dwc3_host_init(struct dwc3 *dwc)
 		goto err1;
 		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",
 	phy_create_lookup(dwc->usb2_generic_phy, "usb2-phy",