* [PATCH] media: staging: rkisp1: remove duplicate macro definition
@ 2020-07-07 18:10 Dafna Hirschfeld
2020-07-10 12:59 ` Helen Koike
0 siblings, 1 reply; 2+ messages in thread
From: Dafna Hirschfeld @ 2020-07-07 18:10 UTC (permalink / raw)
To: linux-media, laurent.pinchart
Cc: dafna.hirschfeld, helen.koike, ezequiel, hverkuil, kernel,
dafna3, sakari.ailus, linux-rockchip, mchehab, tfiga
The macro RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN is defined twice.
Remove the second define.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/staging/media/rkisp1/rkisp1-regs.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-regs.h b/drivers/staging/media/rkisp1/rkisp1-regs.h
index 46018f435b6f..9b8e616ea24c 100644
--- a/drivers/staging/media/rkisp1/rkisp1-regs.h
+++ b/drivers/staging/media/rkisp1/rkisp1-regs.h
@@ -398,7 +398,6 @@
#define RKISP1_CIF_ISP_AWB_YMAX_READ(x) (((x) >> 2) & 1)
#define RKISP1_CIF_ISP_AWB_MODE_RGB_EN ((1 << 31) | (0x2 << 0))
#define RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN ((0 << 31) | (0x2 << 0))
-#define RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN ((0 << 31) | (0x2 << 0))
#define RKISP1_CIF_ISP_AWB_MODE_MASK_NONE 0xFFFFFFFC
#define RKISP1_CIF_ISP_AWB_MODE_READ(x) ((x) & 3)
/* ISP_AWB_GAIN_RB, ISP_AWB_GAIN_G */
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] media: staging: rkisp1: remove duplicate macro definition
2020-07-07 18:10 [PATCH] media: staging: rkisp1: remove duplicate macro definition Dafna Hirschfeld
@ 2020-07-10 12:59 ` Helen Koike
0 siblings, 0 replies; 2+ messages in thread
From: Helen Koike @ 2020-07-10 12:59 UTC (permalink / raw)
To: Dafna Hirschfeld, linux-media, laurent.pinchart
Cc: ezequiel, hverkuil, kernel, dafna3, sakari.ailus, linux-rockchip,
mchehab, tfiga
On 7/7/20 3:10 PM, Dafna Hirschfeld wrote:
> The macro RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN is defined twice.
> Remove the second define.
>
> Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
> ---
> drivers/staging/media/rkisp1/rkisp1-regs.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/staging/media/rkisp1/rkisp1-regs.h b/drivers/staging/media/rkisp1/rkisp1-regs.h
> index 46018f435b6f..9b8e616ea24c 100644
> --- a/drivers/staging/media/rkisp1/rkisp1-regs.h
> +++ b/drivers/staging/media/rkisp1/rkisp1-regs.h
> @@ -398,7 +398,6 @@
> #define RKISP1_CIF_ISP_AWB_YMAX_READ(x) (((x) >> 2) & 1)
> #define RKISP1_CIF_ISP_AWB_MODE_RGB_EN ((1 << 31) | (0x2 << 0))
> #define RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN ((0 << 31) | (0x2 << 0))
> -#define RKISP1_CIF_ISP_AWB_MODE_YCBCR_EN ((0 << 31) | (0x2 << 0))
> #define RKISP1_CIF_ISP_AWB_MODE_MASK_NONE 0xFFFFFFFC
> #define RKISP1_CIF_ISP_AWB_MODE_READ(x) ((x) & 3)
> /* ISP_AWB_GAIN_RB, ISP_AWB_GAIN_G */
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-10 12:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-07 18:10 [PATCH] media: staging: rkisp1: remove duplicate macro definition Dafna Hirschfeld
2020-07-10 12:59 ` Helen Koike
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.