usb: dwc3: qcom: clean up suspend callbacks
authorJohan Hovold <johan+linaro@kernel.org>
Thu, 4 Aug 2022 15:10:01 +0000 (17:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Aug 2022 17:33:40 +0000 (19:33 +0200)
Clean up the suspend callbacks by separating the error and success paths
to improve readability.

Also drop a related redundant initialisation.

Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220804151001.23612-10-johan+linaro@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/dwc3-qcom.c

index b05f67d..197583f 100644 (file)
@@ -959,14 +959,15 @@ static int __maybe_unused dwc3_qcom_pm_suspend(struct device *dev)
 {
        struct dwc3_qcom *qcom = dev_get_drvdata(dev);
        bool wakeup = device_may_wakeup(dev);
-       int ret = 0;
-
+       int ret;
 
        ret = dwc3_qcom_suspend(qcom, wakeup);
-       if (!ret)
-               qcom->pm_suspended = true;
+       if (ret)
+               return ret;
 
-       return ret;
+       qcom->pm_suspended = true;
+
+       return 0;
 }
 
 static int __maybe_unused dwc3_qcom_pm_resume(struct device *dev)
@@ -976,10 +977,12 @@ static int __maybe_unused dwc3_qcom_pm_resume(struct device *dev)
        int ret;
 
        ret = dwc3_qcom_resume(qcom, wakeup);
-       if (!ret)
-               qcom->pm_suspended = false;
+       if (ret)
+               return ret;
 
-       return ret;
+       qcom->pm_suspended = false;
+
+       return 0;
 }
 
 static int __maybe_unused dwc3_qcom_runtime_suspend(struct device *dev)