phy: twl4030: Fix build breakage

Message ID 1415372954-15627-1-git-send-email-balbi@ti.com
State New
Headers show

Commit Message

Felipe Balbi Nov. 7, 2014, 3:09 p.m.
commit e47d925 (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.

Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/phy/phy-twl4030-usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Sergei Shtylyov Nov. 7, 2014, 3:15 p.m. | #1
Hello.

On 11/7/2014 6:09 PM, Felipe Balbi wrote:

> commit e47d925 (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.

> Cc: Kishon Vijay Abraham I <kishon@ti.com>
> Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>   drivers/phy/phy-twl4030-usb.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

> diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> index 7b04bef..109ac5a 100644
> --- a/drivers/phy/phy-twl4030-usb.c
> +++ b/drivers/phy/phy-twl4030-usb.c
> @@ -606,7 +606,7 @@ static int twl4030_set_peripheral(struct usb_otg *otg,
>
>   	otg->gadget = gadget;
>   	if (!gadget)
> -		otg->phy->state = OTG_STATE_UNDEFINED;
> +		otg->phy->otg->state = OTG_STATE_UNDEFINED;

    Hm, why not just 'otg->state'?

[...]

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi Nov. 7, 2014, 3:38 p.m. | #2
On Fri, Nov 07, 2014 at 06:15:24PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 11/7/2014 6:09 PM, Felipe Balbi wrote:
> 
> >commit e47d925 (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.
> 
> >Cc: Kishon Vijay Abraham I <kishon@ti.com>
> >Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
> >Signed-off-by: Felipe Balbi <balbi@ti.com>
> >---
> >  drivers/phy/phy-twl4030-usb.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> >diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
> >index 7b04bef..109ac5a 100644
> >--- a/drivers/phy/phy-twl4030-usb.c
> >+++ b/drivers/phy/phy-twl4030-usb.c
> >@@ -606,7 +606,7 @@ static int twl4030_set_peripheral(struct usb_otg *otg,
> >
> >  	otg->gadget = gadget;
> >  	if (!gadget)
> >-		otg->phy->state = OTG_STATE_UNDEFINED;
> >+		otg->phy->otg->state = OTG_STATE_UNDEFINED;
> 
>    Hm, why not just 'otg->state'?

hehe, because I can't read :-p I'll update

Patch

diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 7b04bef..109ac5a 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -606,7 +606,7 @@  static int twl4030_set_peripheral(struct usb_otg *otg,
 
 	otg->gadget = gadget;
 	if (!gadget)
-		otg->phy->state = OTG_STATE_UNDEFINED;
+		otg->phy->otg->state = OTG_STATE_UNDEFINED;
 
 	return 0;
 }
@@ -618,7 +618,7 @@  static int twl4030_set_host(struct usb_otg *otg, struct usb_bus *host)
 
 	otg->host = host;
 	if (!host)
-		otg->phy->state = OTG_STATE_UNDEFINED;
+		otg->phy->otg->state = OTG_STATE_UNDEFINED;
 
 	return 0;
 }