media: atomisp: remove hmm_pool_[un]register()

These are no-ops, so lets remove them.

Link: https://lore.kernel.org/linux-media/20220615205037.16549-10-hdegoede@redhat.com
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/include/hmm/hmm.h b/drivers/staging/media/atomisp/include/hmm/hmm.h
index b48bdf5..067e031 100644 (file)
--- a/drivers/staging/media/atomisp/include/hmm/hmm.h
+++ b/drivers/staging/media/atomisp/include/hmm/hmm.h
@@ -32,9 +32,6 @@
 #define mmgr_NULL              ((ia_css_ptr)0)
 #define mmgr_EXCEPTION         ((ia_css_ptr) - 1)
 
-int hmm_pool_register(unsigned int pool_size, enum hmm_pool_type pool_type);
-void hmm_pool_unregister(enum hmm_pool_type pool_type);
-
 int hmm_init(void);
 void hmm_cleanup(void);
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
index be6a74d..e78d936 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
@@ -865,12 +865,6 @@ dev_init:
                goto error;
        }
 
-       if (dypool_enable) {
-               ret = hmm_pool_register(dypool_pgnr, HMM_POOL_TYPE_DYNAMIC);
-               if (ret)
-                       dev_err(isp->dev, "Failed to register dynamic memory pool.\n");
-       }
-
        /* Init ISP */
        if (atomisp_css_init(isp)) {
                ret = -EINVAL;
@@ -910,7 +904,6 @@ css_error:
        atomisp_css_uninit(isp);
        pm_runtime_put(vdev->v4l2_dev->dev);
 error:
-       hmm_pool_unregister(HMM_POOL_TYPE_DYNAMIC);
        rt_mutex_unlock(&isp->mutex);
        return ret;
 }
@@ -1032,8 +1025,6 @@ subdev_uninit:
                isp->css_env.isp_css_fw.bytes = 0;
        }
 
-       hmm_pool_unregister(HMM_POOL_TYPE_DYNAMIC);
-
        ret = v4l2_subdev_call(isp->flash, core, s_power, 0);
        if (ret < 0 && ret != -ENODEV && ret != -ENOIOCTLCMD)
                dev_warn(isp->dev, "Failed to power-off flash\n");

diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 49ccfb1..3fd0c52 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -1771,12 +1771,6 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
        pm_runtime_allow(&pdev->dev);
 
        hmm_init_mem_stat(repool_pgnr, dypool_enable, dypool_pgnr);
-       err = hmm_pool_register(repool_pgnr, HMM_POOL_TYPE_RESERVED);
-       if (err) {
-               dev_err(&pdev->dev, "Failed to register reserved memory pool.\n");
-               goto hmm_pool_fail;
-       }
-
        /* Init ISP memory management */
        hmm_init();
 
@@ -1813,8 +1807,6 @@ css_init_fail:
        devm_free_irq(&pdev->dev, pdev->irq, isp);
 request_irq_fail:
        hmm_cleanup();
-       hmm_pool_unregister(HMM_POOL_TYPE_RESERVED);
-hmm_pool_fail:
        pm_runtime_get_noresume(&pdev->dev);
        destroy_workqueue(isp->wdt_work_queue);
 wdt_work_queue_fail:
@@ -1885,8 +1877,6 @@ static void atomisp_pci_remove(struct pci_dev *pdev)
        atomisp_file_input_cleanup(isp);
 
        release_firmware(isp->firmware);
-
-       hmm_pool_unregister(HMM_POOL_TYPE_RESERVED);
 }
 
 static const struct pci_device_id atomisp_pci_tbl[] = {

diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm.c b/drivers/staging/media/atomisp/pci/hmm/hmm.c
index 42f1ab0..f97d443 100644 (file)
--- a/drivers/staging/media/atomisp/pci/hmm/hmm.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm.c
@@ -670,48 +670,6 @@ void hmm_vunmap(ia_css_ptr virt)
        hmm_bo_vunmap(bo);
 }
 
-int hmm_pool_register(unsigned int pool_size, enum hmm_pool_type pool_type)
-{
-#if 0  // Just use the "normal" pool
-       switch (pool_type) {
-       case HMM_POOL_TYPE_RESERVED:
-               reserved_pool.pops = &reserved_pops;
-               return reserved_pool.pops->pool_init(&reserved_pool.pool_info,
-                                                    pool_size);
-       case HMM_POOL_TYPE_DYNAMIC:
-               dynamic_pool.pops = &dynamic_pops;
-               return dynamic_pool.pops->pool_init(&dynamic_pool.pool_info,
-                                                   pool_size);
-       default:
-               dev_err(atomisp_dev, "invalid pool type.\n");
-               return -EINVAL;
-       }
-#else
-       return 0;
-#endif
-}
-
-void hmm_pool_unregister(enum hmm_pool_type pool_type)
-{
-#if 0  // Just use the "normal" pool
-       switch (pool_type) {
-       case HMM_POOL_TYPE_RESERVED:
-               if (reserved_pool.pops && reserved_pool.pops->pool_exit)
-                       reserved_pool.pops->pool_exit(&reserved_pool.pool_info);
-               break;
-       case HMM_POOL_TYPE_DYNAMIC:
-               if (dynamic_pool.pops && dynamic_pool.pops->pool_exit)
-                       dynamic_pool.pops->pool_exit(&dynamic_pool.pool_info);
-               break;
-       default:
-               dev_err(atomisp_dev, "invalid pool type.\n");
-               break;
-       }
-#endif
-
-       return;
-}
-
 void *hmm_isp_vaddr_to_host_vaddr(ia_css_ptr ptr, bool cached)
 {
        return hmm_vmap(ptr, cached);