Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bdb263d authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

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: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@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 7eca937e

drivers/usb/host/xhci-plat.c

+9 −6
Original line number Diff line number Diff line
@@ -72,6 +72,15 @@ static int xhci_plat_setup(struct usb_hcd *hcd) 
			return ret;

	}



	if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_MARVELL_ARMADA)) {

		struct platform_device *pdev;



		pdev = to_platform_device(hcd->self.controller);

		ret = xhci_mvebu_mbus_init_quirk(pdev);

		if (ret)

			return ret;

	}



	return xhci_gen_setup(hcd, xhci_plat_quirks);

}
@@ -207,12 +216,6 @@ static int xhci_plat_probe(struct platform_device *pdev) 
			*priv = *priv_match;

	}



	if (xhci_plat_type_is(hcd, XHCI_PLAT_TYPE_MARVELL_ARMADA)) {

		ret = xhci_mvebu_mbus_init_quirk(pdev);

		if (ret)

			goto disable_clk;

	}



	device_wakeup_enable(hcd->self.controller);



	xhci->clk = clk;