Commit 8b9ca276 authored by Felipe Balbi's avatar Felipe Balbi

phy: twl4030: Fix build breakage

commit e47d9254 (usb: move the OTG state
from the USB PHY to the OTG structure) moved
the OTG state field from struct usb_phy to
struct usb_otg but, even though I fixed many
other build breakages, I still missed one
on phy-twl4030-usb.c.

Fix the build breakage now.

While at that, also a build warning introduced
by the same commit.

Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 004f7d45
...@@ -606,7 +606,7 @@ static int twl4030_set_peripheral(struct usb_otg *otg, ...@@ -606,7 +606,7 @@ static int twl4030_set_peripheral(struct usb_otg *otg,
otg->gadget = gadget; otg->gadget = gadget;
if (!gadget) if (!gadget)
otg->phy->state = OTG_STATE_UNDEFINED; otg->state = OTG_STATE_UNDEFINED;
return 0; return 0;
} }
...@@ -618,7 +618,7 @@ static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host) ...@@ -618,7 +618,7 @@ static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host)
otg->host = host; otg->host = host;
if (!host) if (!host)
otg->phy->state = OTG_STATE_UNDEFINED; otg->state = OTG_STATE_UNDEFINED;
return 0; return 0;
} }
...@@ -676,7 +676,7 @@ static int twl4030_usb_probe(struct platform_device *pdev) ...@@ -676,7 +676,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
twl->phy.otg = otg; twl->phy.otg = otg;
twl->phy.type = USB_PHY_TYPE_USB2; twl->phy.type = USB_PHY_TYPE_USB2;
otg->phy = &twl->phy; otg->usb_phy = &twl->phy;
otg->set_host = twl4030_set_host; otg->set_host = twl4030_set_host;
otg->set_peripheral = twl4030_set_peripheral; otg->set_peripheral = twl4030_set_peripheral;
......
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