Re: [PATCH v3 8/9] usb: chipidea: move usb_otg into struct ci_hdrc

[Peter Chen <peter.chen@freescale.com>]

On Fri, Aug 22, 2014 at 05:50:19PM +0200, Antoine Ténart wrote:
> Move the usb_otg member from struct usb_phy to struct ci_hdrc. Rework
> its initialization taking in account this modification.
> 

If the common usb_otg and usb_phy struct still has another's pointer, you
may not need to add this patch.

> Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com>
> ---
>  drivers/usb/chipidea/ci.h      |  1 +
>  drivers/usb/chipidea/host.c    |  8 +++-----
>  drivers/usb/chipidea/otg_fsm.c | 15 ++-------------
>  3 files changed, 6 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
> index b2caa1772712..dac5ab6adfa2 100644
> --- a/drivers/usb/chipidea/ci.h
> +++ b/drivers/usb/chipidea/ci.h
> @@ -177,6 +177,7 @@ struct ci_hdrc {
>  	struct ci_role_driver		*roles[CI_ROLE_END];
>  	enum ci_role			role;
>  	bool				is_otg;
> +	struct usb_otg			otg;
>  	struct otg_fsm			fsm;
>  	struct ci_otg_fsm_timer_list	*fsm_timer;
>  	struct work_struct		work;
> diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
> index 0b67d78dd953..0952d4adfa4c 100644
> --- a/drivers/usb/chipidea/host.c
> +++ b/drivers/usb/chipidea/host.c
> @@ -85,13 +85,11 @@ static int host_start(struct ci_hdrc *ci)
>  	if (ret) {
>  		goto disable_reg;
>  	} else {
> -		struct usb_otg *otg = ci->usb_phy->otg;
> +		struct usb_otg *otg = &ci->otg;
>  
>  		ci->hcd = hcd;
> -		if (otg) {
> -			otg->host = &hcd->self;
> -			hcd->self.otg_port = 1;
> -		}
> +		otg->host = &hcd->self;
> +		hcd->self.otg_port = 1;
>  	}

You may need use other way to identify if otg is supported or not

>  
>  	if (ci->platdata->flags & CI_HDRC_DISABLE_STREAMING)
> diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
> index 8a64ce87364e..7eb86863fb3c 100644
> --- a/drivers/usb/chipidea/otg_fsm.c
> +++ b/drivers/usb/chipidea/otg_fsm.c
> @@ -778,20 +778,9 @@ void ci_hdrc_otg_fsm_start(struct ci_hdrc *ci)
>  int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
>  {
>  	int retval = 0;
> -	struct usb_otg *otg;
>  
> -	otg = devm_kzalloc(ci->dev,
> -			sizeof(struct usb_otg), GFP_KERNEL);
> -	if (!otg) {
> -		dev_err(ci->dev,
> -		"Failed to allocate usb_otg structure for ci hdrc otg!\n");
> -		return -ENOMEM;
> -	}
> -
> -	otg->usb_phy = ci->usb_phy;
> -	otg->gadget = &ci->gadget;
> -	ci->fsm.otg = otg;
> -	ci->usb_phy->otg = ci->fsm.otg;
> +	ci->otg.usb_phy = ci->usb_phy;
> +	ci->fsm.otg = &ci->otg;
>  	ci->fsm.power_up = 1;
>  	ci->fsm.id = hw_read_otgsc(ci, OTGSC_ID) ? 1 : 0;
>  	ci->fsm.otg->state = OTG_STATE_UNDEFINED;

Why otg->gadget and ci->usb_phy->otg initialization are deleted?
At least, the parameters of usb_otg_state_string at your 7th patch uses it.

-- 
Best Regards,
Peter Chen