media: atomisp: Remove atomisp_css_suspend()/_resume()

atomisp_css_suspend() is a 1:1 copy of atomisp_css_uninit() and
atomisp_css_resume() is a 1:1 copy of atomisp_css_init().

Remove the 2 copies and have their one caller just call
atomisp_css_uninit() / atomisp_css_init() instead.

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 dd245a42a21f33b831d9acca36fad7fe42c7620b..6f3eaad921ff1268662cf65eaff8454f18aa5f6a 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -307,7 +307,7 @@ int atomisp_reset(struct atomisp_device *isp)
        int ret = 0;
 
        dev_dbg(isp->dev, "%s\n", __func__);
-       atomisp_css_suspend(isp);
+       atomisp_css_uninit(isp);
        ret = atomisp_runtime_suspend(isp->dev);
        if (ret < 0)
                dev_err(isp->dev, "atomisp_runtime_suspend failed, %d\n", ret);
@@ -316,7 +316,7 @@ int atomisp_reset(struct atomisp_device *isp)
        if (ret < 0)
                dev_err(isp->dev, "atomisp_runtime_resume failed, %d\n", ret);
 
-       ret = atomisp_css_resume(isp);
+       ret = atomisp_css_init(isp);
        if (ret)
                isp->isp_fatal_error = true;
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp_compat.h
index f73801197dd76e1058752d1ececd42a9ad050c52..7316eb9f974a8eaf40d71be1e839688596b65928 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat.h
@@ -41,10 +41,6 @@ int atomisp_css_init(struct atomisp_device *isp);
 
 void atomisp_css_uninit(struct atomisp_device *isp);
 
-void atomisp_css_suspend(struct atomisp_device *isp);
-
-int atomisp_css_resume(struct atomisp_device *isp);
-
 void atomisp_css_init_struct(struct atomisp_sub_device *asd);
 
 int atomisp_css_irq_translate(struct atomisp_device *isp,

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 96e7f7b58a9568aee2d7dff8825157059f8bdb10..61e2e63a0ef1ca6ebc88324617c57efe6c2bc726 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -868,35 +868,6 @@ void atomisp_css_uninit(struct atomisp_device *isp)
        ia_css_uninit();
 }
 
-void atomisp_css_suspend(struct atomisp_device *isp)
-{
-       isp->css_initialized = false;
-       ia_css_uninit();
-}
-
-int atomisp_css_resume(struct atomisp_device *isp)
-{
-       unsigned int mmu_base_addr;
-       int ret;
-
-       ret = hmm_get_mmu_base_addr(isp->dev, &mmu_base_addr);
-       if (ret) {
-               dev_err(isp->dev, "get base address error.\n");
-               return -EINVAL;
-       }
-
-       ret = ia_css_init(isp->dev, &isp->css_env.isp_css_env, NULL,
-                         mmu_base_addr, IA_CSS_IRQ_TYPE_PULSE);
-       if (ret) {
-               dev_err(isp->dev, "re-init css failed.\n");
-               return -EINVAL;
-       }
-       ia_css_enable_isys_event_queue(true);
-
-       isp->css_initialized = true;
-       return 0;
-}
-
 int atomisp_css_irq_translate(struct atomisp_device *isp,
                              unsigned int *infos)
 {