Commit 90bdf403 authored Jan 13, 2015 by Arnd Bergmann Committed by Felipe Balbi Jan 13, 2015

usb: phy: mv-usb: fix usb_phy build errors



The driver was recently adapted to a core API change, but the
change was incomplete, missing out the suspend helper and
leaving an extraneous local variable around:

usb/phy/phy-mv-usb.c: In function 'mv_otg_update_state':
usb/phy/phy-mv-usb.c:341:18: warning: unused variable 'phy' [-Wunused-variable]

usb/phy/phy-mv-usb.c: In function 'mv_otg_suspend':
usb/phy/phy-mv-usb.c:861:16: error: 'struct usb_phy' has no member named 'state'

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: e47d9254 ("usb: move the OTG state from the USB PHY to the OTG structure")
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent 5fb694f9

drivers/usb/phy/phy-mv-usb.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -338,7 +338,6 @@ static void mv_otg_update_inputs(struct mv_otg *mvotg)
		static void mv_otg_update_state(struct mv_otg *mvotg)
		{
		struct mv_otg_ctrl *otg_ctrl = &mvotg->otg_ctrl;
		struct usb_phy *phy = &mvotg->phy;
		int old_state = mvotg->phy.otg->state;

		switch (old_state) {
		@@ -858,10 +857,10 @@ static int mv_otg_suspend(struct platform_device *pdev, pm_message_t state)
		{
		struct mv_otg *mvotg = platform_get_drvdata(pdev);

		if (mvotg->phy.state != OTG_STATE_B_IDLE) {
		if (mvotg->phy.otg->state != OTG_STATE_B_IDLE) {
		dev_info(&pdev->dev,
		"OTG state is not B_IDLE, it is %d!\n",
		mvotg->phy.state);
		mvotg->phy.otg->state);
		return -EAGAIN;
		}

Admin message