Commit 76f9502f authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman

xhci: plat: adapt to unified device property interface

Requesting the only property that the driver needs using the
unified device property interface so it will be available
for all types of platforms, not just the ones using DT.
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0c77d84
...@@ -138,7 +138,6 @@ MODULE_DEVICE_TABLE(of, usb_xhci_of_match); ...@@ -138,7 +138,6 @@ MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
static int xhci_plat_probe(struct platform_device *pdev) static int xhci_plat_probe(struct platform_device *pdev)
{ {
struct device_node *node = pdev->dev.of_node;
struct usb_xhci_pdata *pdata = dev_get_platdata(&pdev->dev); struct usb_xhci_pdata *pdata = dev_get_platdata(&pdev->dev);
const struct of_device_id *match; const struct of_device_id *match;
const struct hc_driver *driver; const struct hc_driver *driver;
...@@ -202,7 +201,7 @@ static int xhci_plat_probe(struct platform_device *pdev) ...@@ -202,7 +201,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
} }
xhci = hcd_to_xhci(hcd); xhci = hcd_to_xhci(hcd);
match = of_match_node(usb_xhci_of_match, node); match = of_match_node(usb_xhci_of_match, pdev->dev.of_node);
if (match) { if (match) {
const struct xhci_plat_priv *priv_match = match->data; const struct xhci_plat_priv *priv_match = match->data;
struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd); struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
...@@ -223,7 +222,7 @@ static int xhci_plat_probe(struct platform_device *pdev) ...@@ -223,7 +222,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
goto disable_clk; goto disable_clk;
} }
if ((node && of_property_read_bool(node, "usb3-lpm-capable")) || if (device_property_read_bool(&pdev->dev, "usb3-lpm-capable") ||
(pdata && pdata->usb3_lpm_capable)) (pdata && pdata->usb3_lpm_capable))
xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_LPM_SUPPORT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment