| Message ID | 20201204083644.2704-1-vulab@iscas.ac.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | usb: dwc2: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare | expand |
On 12/4/2020 12:36, Xu Wang wrote: > Because clk_prepare_enable() and clk_disable_unprepare() already checked > NULL clock parameter, so the additional checks are unnecessary, just > remove them. > > Signed-off-by: Xu Wang <vulab@iscas.ac.cn> Reviewed-by: Artur Petrosyan <Arthur.Petrosyan@synopsys.com> > --- > drivers/usb/dwc2/platform.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c > index 5f18acac7406..ba2b491c7f82 100644 > --- a/drivers/usb/dwc2/platform.c > +++ b/drivers/usb/dwc2/platform.c > @@ -143,11 +143,9 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg) > if (ret) > return ret; > > - if (hsotg->clk) { > - ret = clk_prepare_enable(hsotg->clk); > - if (ret) > - return ret; > - } > + ret = clk_prepare_enable(hsotg->clk); > + if (ret) > + return ret; > > if (hsotg->uphy) { > ret = usb_phy_init(hsotg->uphy); > @@ -195,8 +193,7 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) > if (ret) > return ret; > > - if (hsotg->clk) > - clk_disable_unprepare(hsotg->clk); > + clk_disable_unprepare(hsotg->clk); > > return 0; > } >
On 12/8/2020 11:29 AM, Artur Petrosyan wrote: > On 12/4/2020 12:36, Xu Wang wrote: >> Because clk_prepare_enable() and clk_disable_unprepare() already checked >> NULL clock parameter, so the additional checks are unnecessary, just >> remove them. >> >> Signed-off-by: Xu Wang <vulab@iscas.ac.cn> > > Reviewed-by: Artur Petrosyan <Arthur.Petrosyan@synopsys.com> > Acked-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index 5f18acac7406..ba2b491c7f82 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -143,11 +143,9 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg) if (ret) return ret; - if (hsotg->clk) { - ret = clk_prepare_enable(hsotg->clk); - if (ret) - return ret; - } + ret = clk_prepare_enable(hsotg->clk); + if (ret) + return ret; if (hsotg->uphy) { ret = usb_phy_init(hsotg->uphy); @@ -195,8 +193,7 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) if (ret) return ret; - if (hsotg->clk) - clk_disable_unprepare(hsotg->clk); + clk_disable_unprepare(hsotg->clk); return 0; }
Because clk_prepare_enable() and clk_disable_unprepare() already checked NULL clock parameter, so the additional checks are unnecessary, just remove them. Signed-off-by: Xu Wang <vulab@iscas.ac.cn> --- drivers/usb/dwc2/platform.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)