drm/amd/display: Replace NUM_ELEMENTS -> ARRAY_SIZE
Subsystems (3)
cover drm/amd/display: Replace NUM_ELEMENTS -> ARRAY_SIZE
There's a coccinelle script which attempts to replace cases where sizeof array is divided by sizeof an element. Most of these occurences have been handled but a few remained in this driver in the shape of the NUM_ELEMENTS macro.
In two cases the NUM_ELEMENTS macro has been removed and its use has been replaced by ARRAY_SIZE. (1)
In 4 files the NUM_ELEMENTS macro existed but was never used so it has just been removed. (2)
I couldn't trace why these cases hadn't been picked up by the coccinelle check. Just NAK this if there's a reason for NUM_ELEMENTS to be kept as is. Thanks.
Linus Probert (2):
drm/amd/display: Replace inline NUM_ELEMENTS macro with ARRAY_SIZE drm/amd/display: Remove unused NUM_ELEMENTS macros
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 5 +++-- drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 6 +++--- drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 3 --- drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 3 --- drivers/gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c | 2 -- drivers/gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 4 ---- 6 files changed, 6 insertions(+), 17 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/2 drm/amd/display: Replace inline NUM_ELEMENTS macro with ARRAY_SIZE
Replaces the use of local NUM_ELEMENTS macro with the ARRAY_SIZE macro defined in <linux/array_size.h>.
This aligns with existing coccinelle script array_size.cocci which has been applied to other sources in order to remove inline sizeof(a)/sizeof(a[0]) patterns from other source files.
--- drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 5 +++-- drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +3 -2
@@ -23,6 +23,8 @@* */ +#include <linux/array_size.h> +#include "dm_services.h" #include "core_types.h" #include "timing_generator.h"
@@ -40,7 +42,6 @@#include "dcn10/dcn10_hubbub.h" #include "dce/dmub_hw_lock_mgr.h" -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0]))#define MAX_NUM_MCACHE 8/* used as index in array of black_color_format */
@@ -230,7 +231,7 @@ const uint16_t *find_color_matrix(enum dc_color_space color_space,int i;enum dc_color_space_type type;const uint16_t *val =NULL ; -int arr_size =NUM_ELEMENTS (output_csc_matrix); +int arr_size =ARRAY_SIZE (output_csc_matrix); type =get_color_space_type (color_space);for (i =0 ; i < arr_size; i++)
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +3 -3
@@ -23,6 +23,8 @@* */ +#include <linux/array_size.h> +#include "dm_services.h"
@@ -57,8 +59,6 @@#define CALC_PLL_CLK_SRC_ERR_TOLERANCE 1#define MAX_PLL_CALC_ERROR 0xFFFFFFFF -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - static const struct spread_spectrum_data *get_ss_data_entry( struct dce110_clk_src *clk_src, enum signal_type signal,
@@ -1267,7 +1267,7 @@ const struct pixel_rate_range_table_entry *look_up_in_video_optimized_rate_tlb( {int i; -for (i =0 ; i <NUM_ELEMENTS (video_optimized_pixel_rates); i++) { +for (i =0 ; i <ARRAY_SIZE (video_optimized_pixel_rates); i++) {const struct pixel_rate_range_table_entry *e = &video_optimized_pixel_rates[i];if (e->range_min_khz <= pixel_rate_khz && pixel_rate_khz <= e->range_max_khz) {
Signature · 1 line
2.53.0
PATCH 2/2 drm/amd/display: Remove unused NUM_ELEMENTS macros
In reply to Linus ProbertRemoves unused NUM_ELEMENTS macros. Discovered while removing cases where ARRAY_SIZE from the header <linus/array_size.h> can be used. This also aligns with the array_size.cocci coccinelle check.
--- drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 3 --- drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 3 --- drivers/gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c | 2 -- drivers/gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 4 ---- 4 files changed, 12 deletions(-)
drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c +0 -3
@@ -49,9 +49,6 @@#define FN (reg_name, field_name) \ dpp->tf_shift->field_name, dpp->tf_mask->field_name -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - -enum dcn10_coef_filter_type_sel {SCL_COEF_LUMA_VERT_FILTER =0 ,SCL_COEF_LUMA_HORZ_FILTER =1 ,
drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c +0 -3
@@ -49,9 +49,6 @@#define FN (reg_name, field_name) \ dpp->tf_shift->field_name, dpp->tf_mask->field_name -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - -enum dcn401_coef_filter_type_sel {SCL_COEF_LUMA_VERT_FILTER =0 ,SCL_COEF_LUMA_HORZ_FILTER =1 ,
drivers/gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c +0 -2
@@ -43,8 +43,6 @@#define FN (reg_name, field_name) \ mpc20->mpc_shift->field_name, mpc20->mpc_mask->field_name -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - void mpc2_update_blending( struct mpc *mpc, struct mpcc_blnd_cfg *blnd_cfg,
drivers/gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c +0 -4
@@ -40,10 +40,6 @@#define FN (reg_name, field_name) \ mpc30->mpc_shift->field_name, mpc30->mpc_mask->field_name - -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - -void mpc3_mpc_init (struct mpc *mpc) {struct dcn30_mpc *mpc30 =TO_DCN30_MPC (mpc);
Signature · 1 line
2.53.0
Alex Deucher
AppliedRe: [PATCH 2/2] drm/amd/display: Remove unused NUM_ELEMENTS macros
Applied the series. Thanks!
Quoted 73 lines · Linus Probert
Removes unused
NUM_ELEMENTSmacros. Discovered while removing cases whereARRAY_SIZEfrom the header <linus/array_size.h> can be used. This also aligns with thearray_size.coccicoccinelle check.Suggested-by Robert P. J. Day <[email protected]>Signed-off-by Linus Probert <[email protected]>--- drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 3 --- drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 3 --- drivers/gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c | 2 -- drivers/gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 4 ---- 4 files changed, 12 deletions(-)drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c +0
-3@@ -49,9 +49,6 @@#define FN (reg_name, field_name) \ dpp->tf_shift->field_name, dpp->tf_mask->field_name -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - -enum dcn10_coef_filter_type_sel {SCL_COEF_LUMA_VERT_FILTER =0 ,SCL_COEF_LUMA_HORZ_FILTER =1 ,drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c +0
-3@@ -49,9 +49,6 @@#define FN (reg_name, field_name) \ dpp->tf_shift->field_name, dpp->tf_mask->field_name -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - -enum dcn401_coef_filter_type_sel {SCL_COEF_LUMA_VERT_FILTER =0 ,SCL_COEF_LUMA_HORZ_FILTER =1 ,drivers/gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c +0
-2@@ -43,8 +43,6 @@#define FN (reg_name, field_name) \ mpc20->mpc_shift->field_name, mpc20->mpc_mask->field_name -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - void mpc2_update_blending( struct mpc *mpc, struct mpcc_blnd_cfg *blnd_cfg,drivers/gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c +0
-5@@ -40,10 +40,6 @@#define FN (reg_name, field_name) \ mpc30->mpc_shift->field_name, mpc30->mpc_mask->field_name - -#define NUM_ELEMENTS (a) (sizeof(a) / sizeof((a)[0])) - -void mpc3_mpc_init (struct mpc *mpc) {struct dcn30_mpc *mpc30 =TO_DCN30_MPC (mpc); --2.53.0