diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1ae310e7fca5..f443dd927ac3 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3586,10 +3586,7 @@ static ssize_t recovery_start_store(struct md_rdev *rdev, const char *buf, size_
 		return -EBUSY;
 
 	rdev->recovery_offset = recovery_start;
-	if (recovery_start == MaxSector)
-		set_bit(In_sync, &rdev->flags);
-	else
-		clear_bit(In_sync, &rdev->flags);
+	assign_bit(In_sync, &rdev->flags, recovery_start == MaxSector);
 	return len;
 }
 
@@ -5915,10 +5912,7 @@ fail_last_dev_store(struct mddev *mddev, const char *buf, size_t len)
 	if (ret)
 		return ret;
 
-	if (value)
-		set_bit(MD_FAILLAST_DEV, &mddev->flags);
-	else
-		clear_bit(MD_FAILLAST_DEV, &mddev->flags);
+	assign_bit(MD_FAILLAST_DEV, &mddev->flags, value);
 
 	return len;
 }
@@ -7573,14 +7567,10 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)
 		}
 
 		clear_bit(In_sync, &rdev->flags); /* just to be sure */
-		if (info->state & (1<<MD_DISK_WRITEMOSTLY))
-			set_bit(WriteMostly, &rdev->flags);
-		else
-			clear_bit(WriteMostly, &rdev->flags);
-		if (info->state & (1<<MD_DISK_FAILFAST))
-			set_bit(FailFast, &rdev->flags);
-		else
-			clear_bit(FailFast, &rdev->flags);
+		assign_bit(WriteMostly, &rdev->flags,
+			   info->state & (1 << MD_DISK_WRITEMOSTLY));
+		assign_bit(FailFast, &rdev->flags,
+			   info->state & (1 << MD_DISK_FAILFAST));
 
 		if (info->state & (1<<MD_DISK_JOURNAL)) {
 			struct md_rdev *rdev2;
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 2600cb5ac393..656c22b8e07e 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -432,10 +432,8 @@ static inline void r5c_update_log_state(struct r5l_log *log)
 			wake_reclaim = true;
 		clear_bit(R5C_LOG_CRITICAL, &conf->cache_state);
 	}
-	if (free_space < 3 * reclaim_space)
-		set_bit(R5C_LOG_TIGHT, &conf->cache_state);
-	else
-		clear_bit(R5C_LOG_TIGHT, &conf->cache_state);
+	assign_bit(R5C_LOG_TIGHT, &conf->cache_state,
+		   free_space < 3 * reclaim_space);
 
 	if (wake_reclaim)
 		r5l_wake_reclaim(log, 0);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 6be9c5432918..c8ea9ba6829e 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -4746,10 +4746,8 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
 				       RAID5_STRIPE_SECTORS(conf)))
 			set_bit(R5_ReadRepl, &dev->flags);
 		else {
-			if (rdev && !test_bit(Faulty, &rdev->flags))
-				set_bit(R5_NeedReplace, &dev->flags);
-			else
-				clear_bit(R5_NeedReplace, &dev->flags);
+			assign_bit(R5_NeedReplace, &dev->flags,
+				   rdev && !test_bit(Faulty, &rdev->flags));
 			rdev = conf->disks[i].rdev;
 			clear_bit(R5_ReadRepl, &dev->flags);
 		}