Staging: media: davinci_vpfe: Drop macros
Subsystems (2)
PATCH v4 1/1 Staging: media: davinci_vpfe: Drop macros
Drop macros instead use functions set_bit() and clear_bit directly.
Signed-off-by Madhumitha Prabakaran <[email protected]>
---
Changes in v4:
- Change local variable data type
- Include set_bit() and clear_bit() kernel functions directly
Changes in v3:
- Drop inline functions and use functions
Changes in v2:
- Convert macros into inline functions
--- .../staging/media/davinci_vpfe/dm365_ipipeif.c | 18 +++++++++--------- .../staging/media/davinci_vpfe/dm365_ipipeif.h | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-)
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c +9 -9
@@ -189,7 +189,7 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd)enum ipipeif_input_source ipipeif_source;u32 isif_port_if;void __iomem *ipipeif_base_addr; -unsigned int val; +unsigned long val;int data_shift;int pack_mode;int source1;
@@ -296,14 +296,14 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd)case MEDIA_BUS_FMT_YUYV8_1X16 :case MEDIA_BUS_FMT_UYVY8_2X8 :case MEDIA_BUS_FMT_Y8_1X8 : -RESETBIT (val,IPIPEIF_CFG2_YUV8_SHIFT ); -SETBIT (val,IPIPEIF_CFG2_YUV16_SHIFT ); +clear_bit (IPIPEIF_CFG2_YUV8_SHIFT , &val); +set_bit (IPIPEIF_CFG2_YUV16_SHIFT , &val);ipipeif_write (val, ipipeif_base_addr,IPIPEIF_CFG2 );break ;default : -RESETBIT (val,IPIPEIF_CFG2_YUV8_SHIFT ); -RESETBIT (val,IPIPEIF_CFG2_YUV16_SHIFT ); +clear_bit (IPIPEIF_CFG2_YUV8_SHIFT , &val); +clear_bit (IPIPEIF_CFG2_YUV16_SHIFT , &val);ipipeif_write (val, ipipeif_base_addr,IPIPEIF_CFG2 );break ; }
@@ -344,16 +344,16 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd)switch (isif_port_if) {case MEDIA_BUS_FMT_YUYV8_1X16 :case MEDIA_BUS_FMT_YUYV10_1X20 : -RESETBIT (val,IPIPEIF_CFG2_YUV8_SHIFT ); -SETBIT (val,IPIPEIF_CFG2_YUV16_SHIFT ); +clear_bit (IPIPEIF_CFG2_YUV8_SHIFT , &val); +set_bit (IPIPEIF_CFG2_YUV16_SHIFT , &val);break ;case MEDIA_BUS_FMT_YUYV8_2X8 :case MEDIA_BUS_FMT_UYVY8_2X8 :case MEDIA_BUS_FMT_Y8_1X8 :case MEDIA_BUS_FMT_YUYV10_2X10 : -SETBIT (val,IPIPEIF_CFG2_YUV8_SHIFT ); -SETBIT (val,IPIPEIF_CFG2_YUV16_SHIFT ); +set_bit (IPIPEIF_CFG2_YUV8_SHIFT , &val); +set_bit (IPIPEIF_CFG2_YUV16_SHIFT , &val); val |=IPIPEIF_CBCR_Y <<IPIPEIF_CFG2_YUV8P_SHIFT ;break ;
drivers/staging/media/davinci_vpfe/dm365_ipipeif.h +0 -2
@@ -166,8 +166,6 @@ struct vpfe_ipipeif_device {#define IPIPEIF_RSZ_MIN 16#define IPIPEIF_RSZ_MAX 112#define IPIPEIF_RSZ_CONST 16 -#define SETBIT (reg, bit) (reg = ((reg) | ((0x00000001)<<(bit)))) -#define RESETBIT (reg, bit) (reg = ((reg) & (~(0x00000001<<(bit)))))#define IPIPEIF_ADOFS_LSB_MASK 0x1ff#define IPIPEIF_ADOFS_LSB_SHIFT 5
Signature · 1 line
2.17.1