[PATCH] media: use assign_bit() where applicable

[Peng Fan (OSS)]

From: Peng Fan <peng.fan@xxxxxxx>

Convert open-coded if/else with set_bit/clear_bit and their
non-atomic __set_bit/__clear_bit variants to the assign_bit/__assign_bit
API.

Done with Coccinelle semantic patch:
    // set_bit -> clear_bit => assign_bit

    @@
    expression cond, bit, addr;
    @@

    -if (cond)
    -        set_bit(bit, addr);
    -else
    -        clear_bit(bit, addr);
    +assign_bit(bit, addr, cond);

    // clear_bit -> set_bit => assign_bit

    @@
    expression cond, bit, addr;
    @@

    -if (cond)
    -        clear_bit(bit, addr);
    -else
    -        set_bit(bit, addr);
    +assign_bit(bit, addr, !cond);

    // __set_bit -> __clear_bit => __assign_bit

    @@
    expression cond, bit, addr;
    @@

    -if (cond)
    -        __set_bit(bit, addr);
    -else
    -        __clear_bit(bit, addr);
    +__assign_bit(bit, addr, cond);

    // __clear_bit -> __set_bit => __assign_bit

    @@
    expression cond, bit, addr;
    @@

    -if (cond)
    -        __clear_bit(bit, addr);
    -else
    -        __set_bit(bit, addr);
    +__assign_bit(bit, addr, !cond);

Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
---
 drivers/media/dvb-frontends/rtl2830.c                    | 5 +----
 drivers/media/dvb-frontends/rtl2832.c                    | 5 +----
 drivers/media/platform/marvell/mcam-core.c               | 5 +----
 drivers/media/platform/samsung/exynos4-is/fimc-capture.c | 5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
index 4c44e2d695f8..fadc12c6d6ae 100644
--- a/drivers/media/dvb-frontends/rtl2830.c
+++ b/drivers/media/dvb-frontends/rtl2830.c
@@ -612,10 +612,7 @@ static int rtl2830_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid, int on
 	if (pid > 0x1fff || index >= 32)
 		return 0;
 
-	if (onoff)
-		set_bit(index, &dev->filters);
-	else
-		clear_bit(index, &dev->filters);
+	assign_bit(index, &dev->filters, onoff);
 
 	/* enable / disable PIDs */
 	buf[0] = (dev->filters >>  0) & 0xff;
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index b31cdb44b383..011c1366e0db 100644
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -986,10 +986,7 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid,
 	if (pid > 0x1fff || index >= 32)
 		return 0;
 
-	if (onoff)
-		set_bit(index, &dev->filters);
-	else
-		clear_bit(index, &dev->filters);
+	assign_bit(index, &dev->filters, onoff);
 
 	/* enable / disable PIDs */
 	buf[0] = (dev->filters >>  0) & 0xff;
diff --git a/drivers/media/platform/marvell/mcam-core.c b/drivers/media/platform/marvell/mcam-core.c
index 2d0b8b60c509..074b86ae09c0 100644
--- a/drivers/media/platform/marvell/mcam-core.c
+++ b/drivers/media/platform/marvell/mcam-core.c
@@ -252,10 +252,7 @@ static inline int mcam_needs_config(struct mcam_camera *cam)
 
 static void mcam_set_config_needed(struct mcam_camera *cam, int needed)
 {
-	if (needed)
-		set_bit(CF_CONFIG_NEEDED, &cam->flags);
-	else
-		clear_bit(CF_CONFIG_NEEDED, &cam->flags);
+	assign_bit(CF_CONFIG_NEEDED, &cam->flags, needed);
 }
 
 /* ------------------------------------------------------------------- */
diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-capture.c b/drivers/media/platform/samsung/exynos4-is/fimc-capture.c
index d85811f4b8c5..1e34119ee117 100644
--- a/drivers/media/platform/samsung/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-capture.c
@@ -997,10 +997,7 @@ static void fimc_capture_mark_jpeg_xfer(struct fimc_ctx *ctx,
 	ctx->scaler.enabled = !jpeg;
 	fimc_ctrls_activate(ctx, !jpeg);
 
-	if (jpeg)
-		set_bit(ST_CAPT_JPEG, &ctx->fimc_dev->state);
-	else
-		clear_bit(ST_CAPT_JPEG, &ctx->fimc_dev->state);
+	assign_bit(ST_CAPT_JPEG, &ctx->fimc_dev->state, jpeg);
 }
 
 static int __fimc_capture_set_format(struct fimc_dev *fimc,
-- 
2.51.0