1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 66afe3cd0b87..ede2461e79c5 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -808,7 +808,7 @@ do_sync_io:
         pr_debug("%dB behind alloc failed, doing sync I/O\n", bio->bi_size);
 }
 
-static int make_request(struct mddev *mddev, struct bio * bio)
+static void make_request(struct mddev *mddev, struct bio * bio)
 {
         struct r1conf *conf = mddev->private;
         struct mirror_info *mirror;
@@ -893,7 +893,7 @@ read_again:
                 if (rdisk < 0) {
                         /* couldn't find anywhere to read from */
                         raid_end_bio_io(r1_bio);
-                        return 0;
+                        return;
                 }
                 mirror = conf->mirrors + rdisk;
 
@@ -951,7 +951,7 @@ read_again:
                         goto read_again;
                 } else
                         generic_make_request(read_bio);
-                return 0;
+                return;
         }
 
         /*
@@ -1152,8 +1152,6 @@ read_again:
 
         if (do_sync || !bitmap || !plugged)
                 md_wakeup_thread(mddev->thread);
-
-        return 0;
 }
 
 static void status(struct seq_file *seq, struct mddev *mddev)
@@ -2194,7 +2192,6 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp
                 bio->bi_next = NULL;
                 bio->bi_flags &= ~(BIO_POOL_MASK-1);
                 bio->bi_flags |= 1 << BIO_UPTODATE;
-                bio->bi_comp_cpu = -1;
                 bio->bi_rw = READ;
                 bio->bi_vcnt = 0;
                 bio->bi_idx = 0;