media: atomisp: Remove some further ATOMISP_ACC_* related dead code

Remove some more code which is no longer referenced after the removal
of the ATOMISP_ACC_* custom ioctls.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.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/linux/atomisp.h b/drivers/staging/media/atomisp/include/linux/atomisp.h
index f96f5ad..3f602b5 100644 (file)
--- a/drivers/staging/media/atomisp/include/linux/atomisp.h
+++ b/drivers/staging/media/atomisp/include/linux/atomisp.h
@@ -740,20 +740,6 @@ enum atomisp_frame_status {
        ATOMISP_FRAME_STATUS_FLASH_FAILED,
 };
 
-/* ISP memories, isp2400 */
-enum atomisp_acc_memory {
-       ATOMISP_ACC_MEMORY_PMEM0 = 0,
-       ATOMISP_ACC_MEMORY_DMEM0,
-       /* for backward compatibility */
-       ATOMISP_ACC_MEMORY_DMEM = ATOMISP_ACC_MEMORY_DMEM0,
-       ATOMISP_ACC_MEMORY_VMEM0,
-       ATOMISP_ACC_MEMORY_VAMEM0,
-       ATOMISP_ACC_MEMORY_VAMEM1,
-       ATOMISP_ACC_MEMORY_VAMEM2,
-       ATOMISP_ACC_MEMORY_HMEM0,
-       ATOMISP_ACC_NR_MEMORY
-};
-
 enum atomisp_ext_isp_id {
        EXT_ISP_CID_ISO = 0,
        EXT_ISP_CID_CAPTURE_HDR,

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp_compat.h
index 3393ae6..54c57bb 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat.h
@@ -442,9 +442,6 @@ int atomisp_css_get_dis_stat(struct atomisp_sub_device *asd,
 
 int atomisp_css_update_stream(struct atomisp_sub_device *asd);
 
-struct atomisp_acc_fw;
-int atomisp_css_set_acc_parameters(struct atomisp_acc_fw *acc_fw);
-
 int atomisp_css_isr_thread(struct atomisp_device *isp,
                           bool *frame_done_found,
                           bool *css_pipe_done);

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 5aa108a..ec47d84 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -3771,24 +3771,6 @@ void atomisp_css_set_cont_prev_start_time(struct atomisp_device *isp,
        return;
 }
 
-/* Set the ACC binary arguments */
-int atomisp_css_set_acc_parameters(struct atomisp_acc_fw *acc_fw)
-{
-       unsigned int mem;
-
-       for (mem = 0; mem < ATOMISP_ACC_NR_MEMORY; mem++) {
-               if (acc_fw->args[mem].length == 0)
-                       continue;
-
-               ia_css_isp_param_set_css_mem_init(&acc_fw->fw->mem_initializers,
-                                                 IA_CSS_PARAM_CLASS_PARAM, mem,
-                                                 acc_fw->args[mem].css_ptr,
-                                                 acc_fw->args[mem].length);
-       }
-
-       return 0;
-}
-
 static struct atomisp_sub_device *__get_atomisp_subdev(
     struct ia_css_pipe *css_pipe,
     struct atomisp_device *isp,

diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.h b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
index e36e112..d1a9857 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_subdev.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
@@ -258,28 +258,6 @@ struct atomisp_css_params_with_list {
        struct list_head list;
 };
 
-struct atomisp_acc_fw {
-       struct ia_css_fw_info *fw;
-       unsigned int handle;
-       unsigned int flags;
-       unsigned int type;
-       struct {
-               size_t length;
-               unsigned long css_ptr;
-       } args[ATOMISP_ACC_NR_MEMORY];
-       struct list_head list;
-};
-
-struct atomisp_map {
-       ia_css_ptr ptr;
-       size_t length;
-       struct list_head list;
-       /* FIXME: should keep book which maps are currently used
-        * by binaries and not allow releasing those
-        * which are in use. Implement by reference counting.
-        */
-};
-
 struct atomisp_sub_device {
        struct v4l2_subdev subdev;
        struct media_pad pads[ATOMISP_SUBDEV_PADS_NUM];