diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-08-28 13:40:57 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-12-11 06:56:44 -0200 |
commit | cd782f9d6d6c4a713b5cc5ccc0bb65f86e294b2f (patch) | |
tree | bf939f954265c40d5368a7cd190acf6036e31128 /drivers/staging/media/omap4iss/iss_resizer.c | |
parent | [media] v4l: omap4iss: Don't make IRQ debugging functions inline (diff) | |
download | linux-dev-cd782f9d6d6c4a713b5cc5ccc0bb65f86e294b2f.tar.xz linux-dev-cd782f9d6d6c4a713b5cc5ccc0bb65f86e294b2f.zip |
[media] v4l: omap4iss: Fix operators precedence in ternary operators
The ternary operator ? : has a low precedence. Use parenthesis where
needed.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_resizer.c')
-rw-r--r-- | drivers/staging/media/omap4iss/iss_resizer.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/media/omap4iss/iss_resizer.c b/drivers/staging/media/omap4iss/iss_resizer.c index 272b92ad38dd..68eb2a704cea 100644 --- a/drivers/staging/media/omap4iss/iss_resizer.c +++ b/drivers/staging/media/omap4iss/iss_resizer.c @@ -118,13 +118,13 @@ static void resizer_enable(struct iss_resizer_device *resizer, u8 enable) writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_EN) & ~RSZ_SRC_EN_SRC_EN) | - enable ? RSZ_SRC_EN_SRC_EN : 0, + (enable ? RSZ_SRC_EN_SRC_EN : 0), iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_EN); /* TODO: Enable RSZB */ writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN) & ~RSZ_EN_EN) | - enable ? RSZ_EN_EN : 0, + (enable ? RSZ_EN_EN : 0), iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RZA_EN); } @@ -202,7 +202,7 @@ static void resizer_configure(struct iss_resizer_device *resizer) /* Select RSZ input */ writel((readl(iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_FMT0) & ~RSZ_SRC_FMT0_SEL) | - (resizer->input == RESIZER_INPUT_IPIPEIF) ? RSZ_SRC_FMT0_SEL : 0, + (resizer->input == RESIZER_INPUT_IPIPEIF ? RSZ_SRC_FMT0_SEL : 0), iss->regs[OMAP4_ISS_MEM_ISP_RESIZER] + RSZ_SRC_FMT0); /* RSZ ignores WEN signal from IPIPE/IPIPEIF */ @@ -318,10 +318,8 @@ void omap4iss_resizer_isr(struct iss_resizer_device *resizer, u32 events) if (events & (ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR | ISP5_IRQ_RSZ_FIFO_OVF)) { dev_dbg(iss->dev, "RSZ Err: FIFO_IN_BLK:%d, FIFO_OVF:%d\n", - (events & - ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR) ? 1 : 0, - (events & - ISP5_IRQ_RSZ_FIFO_OVF) ? 1 : 0); + events & ISP5_IRQ_RSZ_FIFO_IN_BLK_ERR ? 1 : 0, + events & ISP5_IRQ_RSZ_FIFO_OVF ? 1 : 0); pipe->error = true; } |