media: atomisp: Remove double atomisp_mrfld_power_down()/_up() calls from atomisp_reset()

atomisp_reset() calls atomisp_mrfld_power_down() after calling
atomisp_runtime_suspend(), which already calls
atomisp_mrfld_power_down() itself.

And the some goes for atomisp_runtime_resume() / atomisp_mrfld_power_up().

Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 18382ca77dd7d6a875e485b96e5d900397ddf814..dd245a42a21f33b831d9acca36fad7fe42c7620b 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -311,17 +311,11 @@ int atomisp_reset(struct atomisp_device *isp)
        ret = atomisp_runtime_suspend(isp->dev);
        if (ret < 0)
                dev_err(isp->dev, "atomisp_runtime_suspend failed, %d\n", ret);
-       ret = atomisp_mrfld_power_down(isp);
-       if (ret < 0) {
-               dev_err(isp->dev, "can not disable ISP power\n");
-       } else {
-               ret = atomisp_mrfld_power_up(isp);
-               if (ret < 0)
-                       dev_err(isp->dev, "can not enable ISP power\n");
-               ret = atomisp_runtime_resume(isp->dev);
-               if (ret < 0)
-                       dev_err(isp->dev, "atomisp_runtime_resume failed, %d\n", ret);
-       }
+
+       ret = atomisp_runtime_resume(isp->dev);
+       if (ret < 0)
+               dev_err(isp->dev, "atomisp_runtime_resume failed, %d\n", ret);
+
        ret = atomisp_css_resume(isp);
        if (ret)
                isp->isp_fatal_error = true;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.h b/drivers/staging/media/atomisp/pci/atomisp_cmd.h
index d9110bba8c280006222be15c62f8438f43a88318..61cbdc1215dee734341a82505daa09eedfc96ff8 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.h
@@ -341,8 +341,6 @@ int atomisp_inject_a_fake_event(struct atomisp_sub_device *asd, int *event);
 int atomisp_get_invalid_frame_num(struct video_device *vdev,
                                  int *invalid_frame_num);
 
-int atomisp_mrfld_power_up(struct atomisp_device *isp);
-int atomisp_mrfld_power_down(struct atomisp_device *isp);
 int atomisp_runtime_suspend(struct device *dev);
 int atomisp_runtime_resume(struct device *dev);
 #endif /* __ATOMISP_CMD_H__ */

diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index d5bb9906ca6f2c6586eddb34efae1a546967879e..d7fb700252fa23e5e38c1ebe37e6c97f2692bde9 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -725,13 +725,13 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable)
 }
 
 /* Workaround for pmu_nc_set_power_state not ready in MRFLD */
-int atomisp_mrfld_power_down(struct atomisp_device *isp)
+static int atomisp_mrfld_power_down(struct atomisp_device *isp)
 {
        return atomisp_mrfld_power(isp, false);
 }
 
 /* Workaround for pmu_nc_set_power_state not ready in MRFLD */
-int atomisp_mrfld_power_up(struct atomisp_device *isp)
+static int atomisp_mrfld_power_up(struct atomisp_device *isp)
 {
        return atomisp_mrfld_power(isp, true);
 }