usb: dwc2: Get rid of useless error checks in suspend interrupt

Squashed from Douglas Anderson's suggested commit
"usb: dwc2: Get rid of useless error checks for
hibernation/partial power down"

 - After this commit there should never be any
case where dwc2_enter_partial_power_down() and
dwc2_enter_hibernation() are called when
'params.power_down' is not correct.  Get rid of
the pile of error checking.

- As part of this cleanup some of the error messages
not to have __func__ in them.  That's not needed
for dev_err() calls since they already have the
device name as part of the message.

Acked-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
Signed-off-by: Artur Petrosyan <Arthur.Petrosyan@synopsys.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210416124843.9EDCDA005D@mailhost.synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 576c262..6f70ab9 100644 (file)
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -391,9 +391,6 @@ static bool dwc2_iddig_filter_enabled(struct dwc2_hsotg *hsotg)
  */
 int dwc2_enter_hibernation(struct dwc2_hsotg *hsotg, int is_host)
 {
-       if (hsotg->params.power_down != DWC2_POWER_DOWN_PARAM_HIBERNATION)
-               return -ENOTSUPP;
-
        if (is_host)
                return dwc2_host_enter_hibernation(hsotg);
        else

diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
index 470458a..a5ab038 100644 (file)
--- a/drivers/usb/dwc2/core_intr.c
+++ b/drivers/usb/dwc2/core_intr.c
@@ -535,13 +535,10 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
                        switch (hsotg->params.power_down) {
                        case DWC2_POWER_DOWN_PARAM_PARTIAL:
                                ret = dwc2_enter_partial_power_down(hsotg);
-                               if (ret) {
-                                       if (ret != -ENOTSUPP)
-                                               dev_err(hsotg->dev,
-                                                       "%s: enter partial_power_down failed\n",
-                                                       __func__);
-                                       goto skip_power_saving;
-                               }
+                               if (ret)
+                                       dev_err(hsotg->dev,
+                                               "enter partial_power_down failed\n");
+
                                udelay(100);
 
                                /* Ask phy to be suspended */
@@ -550,10 +547,9 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
                                break;
                        case DWC2_POWER_DOWN_PARAM_HIBERNATION:
                                ret = dwc2_enter_hibernation(hsotg, 0);
-                               if (ret && ret != -ENOTSUPP)
+                               if (ret)
                                        dev_err(hsotg->dev,
-                                               "%s: enter hibernation failed\n",
-                                               __func__);
+                                               "enter hibernation failed\n");
                                break;
                        case DWC2_POWER_DOWN_PARAM_NONE:
                                /*
@@ -562,7 +558,7 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
                                 */
                                dwc2_gadget_enter_clock_gating(hsotg);
                        }
-skip_power_saving:
+
                        /*
                         * Change to L2 (suspend) state before releasing
                         * spinlock