Replace macro function by static inline function. Issue suggested by Julia. Signed-off-by: Aline Santana Cordeiro <alinesantanacordeiro@xxxxxxxxx> --- Changes since v1: - Insert file path in commit message - Remove trailing space left during modification drivers/staging/media/omap4iss/iss_resizer.c | 126 ++++++++++++++------------- 1 file changed, 65 insertions(+), 61 deletions(-) diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c index 3b6875c..80ca44d 100644 --- a/drivers/staging/media/omap4iss/iss_resizer.c +++ b/drivers/staging/media/omap4iss/iss_resizer.c @@ -30,13 +30,17 @@ static const unsigned int resizer_fmts[] = { * * Also prints other debug information stored in the RESIZER module. */ -#define RSZ_PRINT_REGISTER(iss, name)\ - dev_dbg(iss->dev, "###RSZ " #name "=0x%08x\n", \ - iss_reg_read(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_##name)) +static inline rsz_print_register(iss, name) +{ + dev_dbg(iss->dev, "###RSZ " #name "=0x%08x\n", + iss_reg_read(iss, OMAP4_ISS_MEM_ISP_RESIZER, RSZ_##name)); +} -#define RZA_PRINT_REGISTER(iss, name)\ - dev_dbg(iss->dev, "###RZA " #name "=0x%08x\n", \ - iss_reg_read(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_##name)) +static inline rza_print_register(iss, name) +{ + dev_dbg(iss->dev, "###RZA " #name "=0x%08x\n", + iss_reg_read(iss, OMAP4_ISS_MEM_ISP_RESIZER, RZA_##name)); +} static void resizer_print_status(struct iss_resizer_device *resizer) { @@ -44,61 +48,61 @@ static void resizer_print_status(struct iss_resizer_device *resizer) dev_dbg(iss->dev, "-------------RESIZER Register dump-------------\n"); - RSZ_PRINT_REGISTER(iss, SYSCONFIG); - RSZ_PRINT_REGISTER(iss, IN_FIFO_CTRL); - RSZ_PRINT_REGISTER(iss, FRACDIV); - RSZ_PRINT_REGISTER(iss, SRC_EN); - RSZ_PRINT_REGISTER(iss, SRC_MODE); - RSZ_PRINT_REGISTER(iss, SRC_FMT0); - RSZ_PRINT_REGISTER(iss, SRC_FMT1); - RSZ_PRINT_REGISTER(iss, SRC_VPS); - RSZ_PRINT_REGISTER(iss, SRC_VSZ); - RSZ_PRINT_REGISTER(iss, SRC_HPS); - RSZ_PRINT_REGISTER(iss, SRC_HSZ); - RSZ_PRINT_REGISTER(iss, DMA_RZA); - RSZ_PRINT_REGISTER(iss, DMA_RZB); - RSZ_PRINT_REGISTER(iss, DMA_STA); - RSZ_PRINT_REGISTER(iss, GCK_MMR); - RSZ_PRINT_REGISTER(iss, GCK_SDR); - RSZ_PRINT_REGISTER(iss, IRQ_RZA); - RSZ_PRINT_REGISTER(iss, IRQ_RZB); - RSZ_PRINT_REGISTER(iss, YUV_Y_MIN); - RSZ_PRINT_REGISTER(iss, YUV_Y_MAX); - RSZ_PRINT_REGISTER(iss, YUV_C_MIN); - RSZ_PRINT_REGISTER(iss, YUV_C_MAX); - RSZ_PRINT_REGISTER(iss, SEQ); - - RZA_PRINT_REGISTER(iss, EN); - RZA_PRINT_REGISTER(iss, MODE); - RZA_PRINT_REGISTER(iss, 420); - RZA_PRINT_REGISTER(iss, I_VPS); - RZA_PRINT_REGISTER(iss, I_HPS); - RZA_PRINT_REGISTER(iss, O_VSZ); - RZA_PRINT_REGISTER(iss, O_HSZ); - RZA_PRINT_REGISTER(iss, V_PHS_Y); - RZA_PRINT_REGISTER(iss, V_PHS_C); - RZA_PRINT_REGISTER(iss, V_DIF); - RZA_PRINT_REGISTER(iss, V_TYP); - RZA_PRINT_REGISTER(iss, V_LPF); - RZA_PRINT_REGISTER(iss, H_PHS); - RZA_PRINT_REGISTER(iss, H_DIF); - RZA_PRINT_REGISTER(iss, H_TYP); - RZA_PRINT_REGISTER(iss, H_LPF); - RZA_PRINT_REGISTER(iss, DWN_EN); - RZA_PRINT_REGISTER(iss, SDR_Y_BAD_H); - RZA_PRINT_REGISTER(iss, SDR_Y_BAD_L); - RZA_PRINT_REGISTER(iss, SDR_Y_SAD_H); - RZA_PRINT_REGISTER(iss, SDR_Y_SAD_L); - RZA_PRINT_REGISTER(iss, SDR_Y_OFT); - RZA_PRINT_REGISTER(iss, SDR_Y_PTR_S); - RZA_PRINT_REGISTER(iss, SDR_Y_PTR_E); - RZA_PRINT_REGISTER(iss, SDR_C_BAD_H); - RZA_PRINT_REGISTER(iss, SDR_C_BAD_L); - RZA_PRINT_REGISTER(iss, SDR_C_SAD_H); - RZA_PRINT_REGISTER(iss, SDR_C_SAD_L); - RZA_PRINT_REGISTER(iss, SDR_C_OFT); - RZA_PRINT_REGISTER(iss, SDR_C_PTR_S); - RZA_PRINT_REGISTER(iss, SDR_C_PTR_E); + rsz_print_register(iss, SYSCONFIG); + rsz_print_register(iss, IN_FIFO_CTRL); + rsz_print_register(iss, FRACDIV); + rsz_print_register(iss, SRC_EN); + rsz_print_register(iss, SRC_MODE); + rsz_print_register(iss, SRC_FMT0); + rsz_print_register(iss, SRC_FMT1); + rsz_print_register(iss, SRC_VPS); + rsz_print_register(iss, SRC_VSZ); + rsz_print_register(iss, SRC_HPS); + rsz_print_register(iss, SRC_HSZ); + rsz_print_register(iss, DMA_RZA); + rsz_print_register(iss, DMA_RZB); + rsz_print_register(iss, DMA_STA); + rsz_print_register(iss, GCK_MMR); + rsz_print_register(iss, GCK_SDR); + rsz_print_register(iss, IRQ_RZA); + rsz_print_register(iss, IRQ_RZB); + rsz_print_register(iss, YUV_Y_MIN); + rsz_print_register(iss, YUV_Y_MAX); + rsz_print_register(iss, YUV_C_MIN); + rsz_print_register(iss, YUV_C_MAX); + rsz_print_register(iss, SEQ); + + rza_print_register(iss, EN); + rza_print_register(iss, MODE); + rza_print_register(iss, 420); + rza_print_register(iss, I_VPS); + rza_print_register(iss, I_HPS); + rza_print_register(iss, O_VSZ); + rza_print_register(iss, O_HSZ); + rza_print_register(iss, V_PHS_Y); + rza_print_register(iss, V_PHS_C); + rza_print_register(iss, V_DIF); + rza_print_register(iss, V_TYP); + rza_print_register(iss, V_LPF); + rza_print_register(iss, H_PHS); + rza_print_register(iss, H_DIF); + rza_print_register(iss, H_TYP); + rza_print_register(iss, H_LPF); + rza_print_register(iss, DWN_EN); + rza_print_register(iss, SDR_Y_BAD_H); + rza_print_register(iss, SDR_Y_BAD_L); + rza_print_register(iss, SDR_Y_SAD_H); + rza_print_register(iss, SDR_Y_SAD_L); + rza_print_register(iss, SDR_Y_OFT); + rza_print_register(iss, SDR_Y_PTR_S); + rza_print_register(iss, SDR_Y_PTR_E); + rza_print_register(iss, SDR_C_BAD_H); + rza_print_register(iss, SDR_C_BAD_L); + rza_print_register(iss, SDR_C_SAD_H); + rza_print_register(iss, SDR_C_SAD_L); + rza_print_register(iss, SDR_C_OFT); + rza_print_register(iss, SDR_C_PTR_S); + rza_print_register(iss, SDR_C_PTR_E); dev_dbg(iss->dev, "-----------------------------------------------\n"); } -- 2.7.4