linux-usb.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] usb: dwc2: use well defined macros for power_down
@ 2020-06-16  8:26 Jisheng Zhang
  2020-06-16 13:49 ` Minas Harutyunyan
  2020-06-18  8:22 ` Greg Kroah-Hartman
  0 siblings, 2 replies; 3+ messages in thread
From: Jisheng Zhang @ 2020-06-16  8:26 UTC (permalink / raw)
  To: Minas Harutyunyan, Greg Kroah-Hartman; +Cc: linux-usb, linux-kernel

Use the well defined macros such as DWC2_POWER_DOWN_PARAM_NONE,
DWC2_POWER_DOWN_PARAM_PARTIAL and DWC2_POWER_DOWN_PARAM_HIBERNATION
to make code more readable.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 drivers/usb/dwc2/hcd.c    |  4 ++--
 drivers/usb/dwc2/params.c | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index b90f858af960..e9ac215b9663 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -3628,7 +3628,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
 				"SetPortFeature - USB_PORT_FEAT_SUSPEND\n");
 			if (windex != hsotg->otg_port)
 				goto error;
-			if (hsotg->params.power_down == 2)
+			if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_HIBERNATION)
 				dwc2_enter_hibernation(hsotg, 1);
 			else
 				dwc2_port_suspend(hsotg, windex);
@@ -3646,7 +3646,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
 			break;
 
 		case USB_PORT_FEAT_RESET:
-			if (hsotg->params.power_down == 2 &&
+			if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_HIBERNATION &&
 			    hsotg->hibernated)
 				dwc2_exit_hibernation(hsotg, 0, 1, 1);
 			hprt0 = dwc2_read_hprt0(hsotg);
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index ce736d67c7c3..8f9d061c4d5f 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -68,14 +68,14 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)
 	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
 		GAHBCFG_HBSTLEN_SHIFT;
 	p->change_speed_quirk = true;
-	p->power_down = false;
+	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
 }
 
 static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg)
 {
 	struct dwc2_core_params *p = &hsotg->params;
 
-	p->power_down = 0;
+	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
 	p->phy_utmi_width = 8;
 }
 
@@ -89,7 +89,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
 	p->host_perio_tx_fifo_size = 256;
 	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
 		GAHBCFG_HBSTLEN_SHIFT;
-	p->power_down = 0;
+	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
 }
 
 static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
@@ -319,11 +319,11 @@ static void dwc2_set_param_power_down(struct dwc2_hsotg *hsotg)
 	int val;
 
 	if (hsotg->hw_params.hibernation)
-		val = 2;
+		val = DWC2_POWER_DOWN_PARAM_HIBERNATION;
 	else if (hsotg->hw_params.power_optimized)
-		val = 1;
+		val = DWC2_POWER_DOWN_PARAM_PARTIAL;
 	else
-		val = 0;
+		val = DWC2_POWER_DOWN_PARAM_NONE;
 
 	hsotg->params.power_down = val;
 }
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] usb: dwc2: use well defined macros for power_down
  2020-06-16  8:26 [PATCH] usb: dwc2: use well defined macros for power_down Jisheng Zhang
@ 2020-06-16 13:49 ` Minas Harutyunyan
  2020-06-18  8:22 ` Greg Kroah-Hartman
  1 sibling, 0 replies; 3+ messages in thread
From: Minas Harutyunyan @ 2020-06-16 13:49 UTC (permalink / raw)
  To: Jisheng Zhang, Greg Kroah-Hartman; +Cc: linux-usb, linux-kernel

Hi,

On 6/16/2020 12:26 PM, Jisheng Zhang wrote:
> Use the well defined macros such as DWC2_POWER_DOWN_PARAM_NONE,
> DWC2_POWER_DOWN_PARAM_PARTIAL and DWC2_POWER_DOWN_PARAM_HIBERNATION
> to make code more readable.
> 
> Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>

Acked-by: Minas Harutyunyan <hminas@synopsys.com>

> ---
>   drivers/usb/dwc2/hcd.c    |  4 ++--
>   drivers/usb/dwc2/params.c | 12 ++++++------
>   2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> index b90f858af960..e9ac215b9663 100644
> --- a/drivers/usb/dwc2/hcd.c
> +++ b/drivers/usb/dwc2/hcd.c
> @@ -3628,7 +3628,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
>   				"SetPortFeature - USB_PORT_FEAT_SUSPEND\n");
>   			if (windex != hsotg->otg_port)
>   				goto error;
> -			if (hsotg->params.power_down == 2)
> +			if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_HIBERNATION)
>   				dwc2_enter_hibernation(hsotg, 1);
>   			else
>   				dwc2_port_suspend(hsotg, windex);
> @@ -3646,7 +3646,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
>   			break;
>   
>   		case USB_PORT_FEAT_RESET:
> -			if (hsotg->params.power_down == 2 &&
> +			if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_HIBERNATION &&
>   			    hsotg->hibernated)
>   				dwc2_exit_hibernation(hsotg, 0, 1, 1);
>   			hprt0 = dwc2_read_hprt0(hsotg);
> diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
> index ce736d67c7c3..8f9d061c4d5f 100644
> --- a/drivers/usb/dwc2/params.c
> +++ b/drivers/usb/dwc2/params.c
> @@ -68,14 +68,14 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)
>   	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
>   		GAHBCFG_HBSTLEN_SHIFT;
>   	p->change_speed_quirk = true;
> -	p->power_down = false;
> +	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>   }
>   
>   static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg)
>   {
>   	struct dwc2_core_params *p = &hsotg->params;
>   
> -	p->power_down = 0;
> +	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>   	p->phy_utmi_width = 8;
>   }
>   
> @@ -89,7 +89,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
>   	p->host_perio_tx_fifo_size = 256;
>   	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
>   		GAHBCFG_HBSTLEN_SHIFT;
> -	p->power_down = 0;
> +	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>   }
>   
>   static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
> @@ -319,11 +319,11 @@ static void dwc2_set_param_power_down(struct dwc2_hsotg *hsotg)
>   	int val;
>   
>   	if (hsotg->hw_params.hibernation)
> -		val = 2;
> +		val = DWC2_POWER_DOWN_PARAM_HIBERNATION;
>   	else if (hsotg->hw_params.power_optimized)
> -		val = 1;
> +		val = DWC2_POWER_DOWN_PARAM_PARTIAL;
>   	else
> -		val = 0;
> +		val = DWC2_POWER_DOWN_PARAM_NONE;
>   
>   	hsotg->params.power_down = val;
>   }
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] usb: dwc2: use well defined macros for power_down
  2020-06-16  8:26 [PATCH] usb: dwc2: use well defined macros for power_down Jisheng Zhang
  2020-06-16 13:49 ` Minas Harutyunyan
@ 2020-06-18  8:22 ` Greg Kroah-Hartman
  1 sibling, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2020-06-18  8:22 UTC (permalink / raw)
  To: Jisheng Zhang; +Cc: Minas Harutyunyan, linux-usb, linux-kernel

On Tue, Jun 16, 2020 at 04:26:17PM +0800, Jisheng Zhang wrote:
> Use the well defined macros such as DWC2_POWER_DOWN_PARAM_NONE,
> DWC2_POWER_DOWN_PARAM_PARTIAL and DWC2_POWER_DOWN_PARAM_HIBERNATION
> to make code more readable.
> 
> Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
> Acked-by: Minas Harutyunyan <hminas@synopsys.com>
> ---
>  drivers/usb/dwc2/hcd.c    |  4 ++--
>  drivers/usb/dwc2/params.c | 12 ++++++------
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
> index b90f858af960..e9ac215b9663 100644
> --- a/drivers/usb/dwc2/hcd.c
> +++ b/drivers/usb/dwc2/hcd.c
> @@ -3628,7 +3628,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
>  				"SetPortFeature - USB_PORT_FEAT_SUSPEND\n");
>  			if (windex != hsotg->otg_port)
>  				goto error;
> -			if (hsotg->params.power_down == 2)
> +			if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_HIBERNATION)
>  				dwc2_enter_hibernation(hsotg, 1);
>  			else
>  				dwc2_port_suspend(hsotg, windex);
> @@ -3646,7 +3646,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
>  			break;
>  
>  		case USB_PORT_FEAT_RESET:
> -			if (hsotg->params.power_down == 2 &&
> +			if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_HIBERNATION &&
>  			    hsotg->hibernated)
>  				dwc2_exit_hibernation(hsotg, 0, 1, 1);
>  			hprt0 = dwc2_read_hprt0(hsotg);
> diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
> index ce736d67c7c3..8f9d061c4d5f 100644
> --- a/drivers/usb/dwc2/params.c
> +++ b/drivers/usb/dwc2/params.c
> @@ -68,14 +68,14 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg)
>  	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
>  		GAHBCFG_HBSTLEN_SHIFT;
>  	p->change_speed_quirk = true;
> -	p->power_down = false;
> +	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>  }
>  
>  static void dwc2_set_s3c6400_params(struct dwc2_hsotg *hsotg)
>  {
>  	struct dwc2_core_params *p = &hsotg->params;
>  
> -	p->power_down = 0;
> +	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>  	p->phy_utmi_width = 8;
>  }
>  
> @@ -89,7 +89,7 @@ static void dwc2_set_rk_params(struct dwc2_hsotg *hsotg)
>  	p->host_perio_tx_fifo_size = 256;
>  	p->ahbcfg = GAHBCFG_HBSTLEN_INCR16 <<
>  		GAHBCFG_HBSTLEN_SHIFT;
> -	p->power_down = 0;
> +	p->power_down = DWC2_POWER_DOWN_PARAM_NONE;
>  }
>  
>  static void dwc2_set_ltq_params(struct dwc2_hsotg *hsotg)
> @@ -319,11 +319,11 @@ static void dwc2_set_param_power_down(struct dwc2_hsotg *hsotg)
>  	int val;
>  
>  	if (hsotg->hw_params.hibernation)
> -		val = 2;
> +		val = DWC2_POWER_DOWN_PARAM_HIBERNATION;
>  	else if (hsotg->hw_params.power_optimized)
> -		val = 1;
> +		val = DWC2_POWER_DOWN_PARAM_PARTIAL;
>  	else
> -		val = 0;
> +		val = DWC2_POWER_DOWN_PARAM_NONE;
>  
>  	hsotg->params.power_down = val;
>  }
> -- 
> 2.27.0
> 

This does not apply to Linus's tree :(

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-06-18  8:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-16  8:26 [PATCH] usb: dwc2: use well defined macros for power_down Jisheng Zhang
2020-06-16 13:49 ` Minas Harutyunyan
2020-06-18  8:22 ` Greg Kroah-Hartman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).