On 2023-07-27 18:04:52, Dmitry Baryshkov wrote:
> There is no point in passing the IRQ index to IRQ callbacks, no function
> uses that. Drop it at last.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Reviewed-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h | 2 +-
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 ++--
> drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 2 +-
> .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 8 ++++----
> .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 4 ++--
> .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 16 +++++-----------
> .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 4 ++--
> .../gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 2 +-
> 8 files changed, 18 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
> index b5b6e7031fb9..ba06312cbb16 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h
> @@ -53,7 +53,7 @@ u32 dpu_core_irq_read(
> int dpu_core_irq_register_callback(
> struct dpu_kms *dpu_kms,
> int irq_idx,
> - void (*irq_cb)(void *arg, int irq_idx),
> + void (*irq_cb)(void *arg),
> void *irq_arg);
>
> /**
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index f0a2a1dca741..051447a3620c 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -352,7 +352,7 @@ static int dpu_encoder_helper_wait_event_timeout(int32_t drm_id,
>
> int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,
> int irq,
> - void (*func)(void *arg, int irq_idx),
> + void (*func)(void *arg),
> struct dpu_encoder_wait_info *wait_info)
> {
> u32 irq_status;
> @@ -399,7 +399,7 @@ int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,
> phys_enc->hw_pp->idx - PINGPONG_0,
> atomic_read(wait_info->atomic_cnt));
> local_irq_save(flags);
> - func(phys_enc, irq);
> + func(phys_enc);
> local_irq_restore(flags);
> ret = 0;
> } else {
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> index d48558ede488..f91661a69888 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> @@ -365,7 +365,7 @@ void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys *phys_enc,
> */
> int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,
> int irq,
> - void (*func)(void *arg, int irq_idx),
> + void (*func)(void *arg),
> struct dpu_encoder_wait_info *wait_info);
>
> /**
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
> index df88358e7037..9589fe719452 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
> @@ -76,7 +76,7 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg(
> phys_enc->hw_intf->ops.program_intf_cmd_cfg(phys_enc->hw_intf, &cmd_mode_cfg);
> }
>
> -static void dpu_encoder_phys_cmd_pp_tx_done_irq(void *arg, int irq_idx)
> +static void dpu_encoder_phys_cmd_pp_tx_done_irq(void *arg)
> {
> struct dpu_encoder_phys *phys_enc = arg;
> unsigned long lock_flags;
> @@ -103,7 +103,7 @@ static void dpu_encoder_phys_cmd_pp_tx_done_irq(void *arg, int irq_idx)
> DPU_ATRACE_END("pp_done_irq");
> }
>
> -static void dpu_encoder_phys_cmd_te_rd_ptr_irq(void *arg, int irq_idx)
> +static void dpu_encoder_phys_cmd_te_rd_ptr_irq(void *arg)
> {
> struct dpu_encoder_phys *phys_enc = arg;
> struct dpu_encoder_phys_cmd *cmd_enc;
> @@ -126,7 +126,7 @@ static void dpu_encoder_phys_cmd_te_rd_ptr_irq(void *arg, int irq_idx)
> DPU_ATRACE_END("rd_ptr_irq");
> }
>
> -static void dpu_encoder_phys_cmd_ctl_start_irq(void *arg, int irq_idx)
> +static void dpu_encoder_phys_cmd_ctl_start_irq(void *arg)
> {
> struct dpu_encoder_phys *phys_enc = arg;
>
> @@ -139,7 +139,7 @@ static void dpu_encoder_phys_cmd_ctl_start_irq(void *arg, int irq_idx)
> DPU_ATRACE_END("ctl_start_irq");
> }
>
> -static void dpu_encoder_phys_cmd_underrun_irq(void *arg, int irq_idx)
> +static void dpu_encoder_phys_cmd_underrun_irq(void *arg)
> {
> struct dpu_encoder_phys *phys_enc = arg;
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> index c2189e58de6a..a01fda711883 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> @@ -297,7 +297,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine(
> programmable_fetch_config(phys_enc, &timing_params);
> }
>
> -static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx)
> +static void dpu_encoder_phys_vid_vblank_irq(void *arg)
> {
> struct dpu_encoder_phys *phys_enc = arg;
> struct dpu_hw_ctl *hw_ctl;
> @@ -334,7 +334,7 @@ static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx)
> DPU_ATRACE_END("vblank_irq");
> }
>
> -static void dpu_encoder_phys_vid_underrun_irq(void *arg, int irq_idx)
> +static void dpu_encoder_phys_vid_underrun_irq(void *arg)
> {
> struct dpu_encoder_phys *phys_enc = arg;
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> index a466ff70a4d6..7df5e7f4a0e2 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
> @@ -345,7 +345,11 @@ static void dpu_encoder_phys_wb_setup(
>
> }
>
> -static void _dpu_encoder_phys_wb_frame_done_helper(void *arg)
> +/**
> + * dpu_encoder_phys_wb_done_irq - writeback interrupt handler
> + * @arg: Pointer to writeback encoder
> + */
> +static void dpu_encoder_phys_wb_done_irq(void *arg)
> {
> struct dpu_encoder_phys *phys_enc = arg;
> struct dpu_encoder_phys_wb *wb_enc = to_dpu_encoder_phys_wb(phys_enc);
> @@ -371,16 +375,6 @@ static void _dpu_encoder_phys_wb_frame_done_helper(void *arg)
> wake_up_all(&phys_enc->pending_kickoff_wq);
> }
>
> -/**
> - * dpu_encoder_phys_wb_done_irq - writeback interrupt handler
> - * @arg: Pointer to writeback encoder
> - * @irq_idx: interrupt index
> - */
> -static void dpu_encoder_phys_wb_done_irq(void *arg, int irq_idx)
> -{
> - _dpu_encoder_phys_wb_frame_done_helper(arg);
> -}
> -
> /**
> * dpu_encoder_phys_wb_irq_ctrl - irq control of WB
> * @phys: Pointer to physical encoder
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> index e3c50439f80a..01a9ccfcd54b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c
> @@ -217,7 +217,7 @@ static void dpu_core_irq_callback_handler(struct dpu_kms *dpu_kms, int irq_idx)
> /*
> * Perform registered function callback
> */
> - dpu_kms->hw_intr->irq_tbl[irq_idx].cb(dpu_kms->hw_intr->irq_tbl[irq_idx].arg, irq_idx);
> + dpu_kms->hw_intr->irq_tbl[irq_idx].cb(dpu_kms->hw_intr->irq_tbl[irq_idx].arg);
> }
>
> irqreturn_t dpu_core_irq(struct msm_kms *kms)
> @@ -507,7 +507,7 @@ void dpu_hw_intr_destroy(struct dpu_hw_intr *intr)
> }
>
> int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
> - void (*irq_cb)(void *arg, int irq_idx),
> + void (*irq_cb)(void *arg),
> void *irq_arg)
> {
> unsigned long irq_flags;
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h
> index dab761e54863..e2b00dd32619 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h
> @@ -58,7 +58,7 @@ struct dpu_hw_intr {
> const struct dpu_intr_reg *intr_set;
>
> struct {
> - void (*cb)(void *arg, int irq_idx);
> + void (*cb)(void *arg);
> void *arg;
> atomic_t count;
> } irq_tbl[];
> --
> 2.39.2
>
