media: atomisp: Remove unused QOS defines / structure member

With the accel code gone this is unused, remove it.

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/runtime/pipeline/interface/ia_css_pipeline.h b/drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h
index de2c526a58ae1660b7d3d3cb52472c705852e4be..222c381ff3b9a32bee65336166b7b47bb656a69e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h
+++ b/drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h
@@ -54,7 +54,6 @@ struct ia_css_pipeline {
        unsigned int inout_port_config;
        int num_execs;
        bool acquire_isp_each_stage;
-       u32 pipe_qos_config;
 };
 
 #define DEFAULT_PIPELINE { \
@@ -65,7 +64,6 @@ struct ia_css_pipeline {
        .dvs_frame_delay        = IA_CSS_FRAME_DELAY_1, \
        .num_execs              = -1, \
        .acquire_isp_each_stage = true, \
-       .pipe_qos_config        = QOS_INVALID \
 }
 
 /* Stage descriptor used to create a new stage in the pipeline */

diff --git a/drivers/staging/media/atomisp/pci/sh_css_internal.h b/drivers/staging/media/atomisp/pci/sh_css_internal.h
index 98267707a5fc4d0d65c323fdc108b8cac2ed2c27..0441d4fec5516708277cb6496307e1b2e36dbf1e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css_internal.h
+++ b/drivers/staging/media/atomisp/pci/sh_css_internal.h
@@ -488,15 +488,6 @@ ia_css_metadata_free_multiple(unsigned int num_bufs,
 
 /* Macro for handling pipe_qos_config */
 #define QOS_INVALID                  (~0U)
-#define QOS_ALL_STAGES_DISABLED      (0U)
-#define QOS_STAGE_MASK(num)          (0x00000001 << num)
-#define SH_CSS_IS_QOS_PIPE(pipe)               ((pipe)->pipe_qos_config != QOS_INVALID)
-#define SH_CSS_QOS_STAGE_ENABLE(pipe, num)     ((pipe)->pipe_qos_config |= QOS_STAGE_MASK(num))
-#define SH_CSS_QOS_STAGE_DISABLE(pipe, num)    ((pipe)->pipe_qos_config &= ~QOS_STAGE_MASK(num))
-#define SH_CSS_QOS_STAGE_IS_ENABLED(pipe, num) ((pipe)->pipe_qos_config & QOS_STAGE_MASK(num))
-#define SH_CSS_QOS_STAGE_IS_ALL_DISABLED(pipe) ((pipe)->pipe_qos_config == QOS_ALL_STAGES_DISABLED)
-#define SH_CSS_QOS_MODE_PIPE_ADD(mode, pipe)    ((mode) |= (0x1 << (pipe)->pipe_id))
-#define SH_CSS_QOS_MODE_PIPE_REMOVE(mode, pipe) ((mode) &= ~(0x1 << (pipe)->pipe_id))
 
 /* Information for a pipeline */
 struct sh_css_sp_pipeline {

diff --git a/drivers/staging/media/atomisp/pci/sh_css_sp.c b/drivers/staging/media/atomisp/pci/sh_css_sp.c
index c301298b8ee42061df2e77d5a97d6ddd52d5966e..0dd58a7fe2cc9a855bb4902d20a49a31da7be76a 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css_sp.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_sp.c
@@ -1266,7 +1266,7 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me,
        sh_css_sp_group.pipe[thread_id].thread_id = thread_id;
        sh_css_sp_group.pipe[thread_id].pipe_num = pipe_num;
        sh_css_sp_group.pipe[thread_id].num_execs = me->num_execs;
-       sh_css_sp_group.pipe[thread_id].pipe_qos_config = me->pipe_qos_config;
+       sh_css_sp_group.pipe[thread_id].pipe_qos_config = QOS_INVALID;
        sh_css_sp_group.pipe[thread_id].required_bds_factor = required_bds_factor;
        sh_css_sp_group.pipe[thread_id].input_system_mode
        = (uint32_t)input_mode;