Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: host: xhci: plat: move mvebu init_quirk() to xhci_plat_setup()

xhci_plat_setup() is the rightful place for
xhci_mvebu_mbus_init_quirk(), so let's move it there
in order to make it simpler to get rid of
xhci_plat_type_is() later on.

Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Felipe Balbi and committed by
Greg Kroah-Hartman
3bdb263d 7eca937e

+9 -6
+9 -6
drivers/usb/host/xhci-plat.c
··· 72 72 return ret; 73 73 } 74 74 75 + if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_MARVELL_ARMADA)) { 76 + struct platform_device *pdev; 77 + 78 + pdev = to_platform_device(hcd->self.controller); 79 + ret = xhci_mvebu_mbus_init_quirk(pdev); 80 + if (ret) 81 + return ret; 82 + } 83 + 75 84 return xhci_gen_setup(hcd, xhci_plat_quirks); 76 85 } 77 86 ··· 214 205 /* Just copy data for now */ 215 206 if (priv_match) 216 207 *priv = *priv_match; 217 - } 218 - 219 - if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_MARVELL_ARMADA)) { 220 - ret = xhci_mvebu_mbus_init_quirk(pdev); 221 - if (ret) 222 - goto disable_clk; 223 208 } 224 209 225 210 device_wakeup_enable(hcd->self.controller);