Commit 07d9878f authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Greg Kroah-Hartman
Browse files

usb: dwc2: use well defined macros for power_down 



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: default avatarJisheng Zhang <Jisheng.Zhang@synaptics.com>
Acked-by: default avatarMinas Harutyunyan <hminas@synopsys.com>
Link: https://lore.kernel.org/r/20200616162617.38365cc8@xhacker.debian


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f3aedbe

drivers/usb/dwc2/hcd.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/usb/dwc2/params.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE