media: atomisp: remove polling_mode and subscr_index

This patch removes polling_mode and subscr_index from
`struct virtual_input_system_stream_s` as well as its usage [1]. Note
that for subscr_index, only the definition were removed because it was
not used anywhere.

[1] added on updating css version to irci_master_20150701_0213
    https://raw.githubusercontent.com/intel/ProductionKernelQuilts/cht-m1stable-2016_ww31/uefi/cht-m1stable/patches/cam-0439-atomisp2-css2401-and-2401_legacy-irci_master_2015070.patch
    ("atomisp2: css2401 and 2401_legacy-irci_master_20150701_0213")

Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/isp2401_input_system_global.h b/drivers/staging/media/atomisp/pci/isp2401_input_system_global.h
index f387738..e3c8606 100644 (file)
--- a/drivers/staging/media/atomisp/pci/isp2401_input_system_global.h
+++ b/drivers/staging/media/atomisp/pci/isp2401_input_system_global.h
@@ -44,11 +44,6 @@ typedef enum {
        N_INPUT_SYSTEM_SOURCE_TYPE
 } input_system_source_type_t;
 
-typedef enum {
-       INPUT_SYSTEM_POLL_ON_WAIT_FOR_FRAME,
-       INPUT_SYSTEM_POLL_ON_CAPTURE_REQUEST,
-} input_system_polling_mode_t;
-
 typedef struct input_system_channel_s input_system_channel_t;
 struct input_system_channel_s {
        stream2mmio_ID_t        stream2mmio_id;
@@ -111,9 +106,6 @@ struct isp2401_input_system_cfg_s {
 
        input_system_source_type_t      mode;
 
-       /* ISP2401 */
-       input_system_polling_mode_t     polling_mode;
-
        bool online;
        bool raw_packed;
        s8 linked_isys_stream_id;
@@ -165,10 +157,6 @@ struct virtual_input_system_stream_s {
        u8 online;
        s8 linked_isys_stream_id;
        u8 valid;
-
-       /* ISP2401 */
-       input_system_polling_mode_t     polling_mode;
-       s32 subscr_index;
 };
 
 typedef struct virtual_input_system_stream_cfg_s

diff --git a/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
index 82f3c19..8fc7746 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
+++ b/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
@@ -189,17 +189,6 @@ ia_css_isys_error_t ia_css_isys_stream_create(
                return false;
        }
 
-#ifdef ISP2401
-       /*
-        * Early polling is required for timestamp accuracy in certain cause.
-        * The ISYS HW polling is started on
-        * ia_css_isys_stream_capture_indication() instead of
-        * ia_css_pipeline_sp_wait_for_isys_stream_N() as isp processing of
-        * capture takes longer than getting an ISYS frame
-        */
-       isys_stream->polling_mode = isys_stream_descr->polling_mode;
-
-#endif
        /* create metadata channel */
        if (isys_stream_descr->metadata.enable) {
                rc = create_input_system_channel(isys_stream_descr, true,

diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index ba25d0d..7900307 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -1000,20 +1000,10 @@ static bool sh_css_translate_stream_cfg_to_isys_stream_descr(
        isys_stream_descr->raw_packed = stream_cfg->pack_raw_pixels;
        isys_stream_descr->linked_isys_stream_id = (int8_t)
                stream_cfg->isys_config[isys_stream_idx].linked_isys_stream_id;
-       /*
-        * Early polling is required for timestamp accuracy in certain case.
-        * The ISYS HW polling is started on
-        * ia_css_isys_stream_capture_indication() instead of
-        * ia_css_pipeline_sp_wait_for_isys_stream_N() as isp processing of
-        * capture takes longer than getting an ISYS frame
-        */
-       if (IS_ISP2401) {
-               isys_stream_descr->polling_mode
-                   = early_polling ? INPUT_SYSTEM_POLL_ON_CAPTURE_REQUEST
-                     : INPUT_SYSTEM_POLL_ON_WAIT_FOR_FRAME;
+
+       if (IS_ISP2401)
                ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
                                    "sh_css_translate_stream_cfg_to_isys_stream_descr() leave:\n");
-       }
 
        return rc;
 }