media: imx: imx8mq-mipi_csi2: Remove unneeded code
authorMuhammad Usama Anjum <usama.anjum@collabora.com>
Fri, 28 Jan 2022 17:07:22 +0000 (18:07 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Mon, 7 Mar 2022 10:52:45 +0000 (11:52 +0100)
ret is constant in imx8mq_mipi_csi_pm_suspend(). This function cannot
return error. Remove the return variable. Simplify other functions which
are using this function.

Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/staging/media/imx/imx8mq-mipi-csi2.c

index 56ef3b3..476ee8e 100644 (file)
@@ -693,11 +693,10 @@ err_parse:
  * Suspend/resume
  */
 
-static int imx8mq_mipi_csi_pm_suspend(struct device *dev)
+static void imx8mq_mipi_csi_pm_suspend(struct device *dev)
 {
        struct v4l2_subdev *sd = dev_get_drvdata(dev);
        struct csi_state *state = mipi_sd_to_csi2_state(sd);
-       int ret = 0;
 
        mutex_lock(&state->lock);
 
@@ -708,8 +707,6 @@ static int imx8mq_mipi_csi_pm_suspend(struct device *dev)
        }
 
        mutex_unlock(&state->lock);
-
-       return ret ? -EAGAIN : 0;
 }
 
 static int imx8mq_mipi_csi_pm_resume(struct device *dev)
@@ -742,15 +739,12 @@ static int __maybe_unused imx8mq_mipi_csi_suspend(struct device *dev)
 {
        struct v4l2_subdev *sd = dev_get_drvdata(dev);
        struct csi_state *state = mipi_sd_to_csi2_state(sd);
-       int ret;
 
-       ret = imx8mq_mipi_csi_pm_suspend(dev);
-       if (ret)
-               return ret;
+       imx8mq_mipi_csi_pm_suspend(dev);
 
        state->state |= ST_SUSPENDED;
 
-       return ret;
+       return 0;
 }
 
 static int __maybe_unused imx8mq_mipi_csi_resume(struct device *dev)
@@ -770,9 +764,7 @@ static int __maybe_unused imx8mq_mipi_csi_runtime_suspend(struct device *dev)
        struct csi_state *state = mipi_sd_to_csi2_state(sd);
        int ret;
 
-       ret = imx8mq_mipi_csi_pm_suspend(dev);
-       if (ret)
-               return ret;
+       imx8mq_mipi_csi_pm_suspend(dev);
 
        ret = icc_set_bw(state->icc_path, 0, 0);
        if (ret)