clk: samsung: Fix double add of syscore ops after driver rebind

[deliverable/linux.git] / drivers / md / multipath.c

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 849ad39f547b9c1fbb8d993e118261a33b242134..399272f9c0425aee7f3c508cd8d87a2a60a40c9f 100644 (file)
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -31,13 +31,12 @@
 
 #define        NR_RESERVED_BUFS        32
 
-
 static int multipath_map (struct mpconf *conf)
 {
        int i, disks = conf->raid_disks;
 
        /*
-        * Later we do read balancing on the read side 
+        * Later we do read balancing on the read side
         * now we use the first available disk.
         */
 
@@ -68,7 +67,6 @@ static void multipath_reschedule_retry (struct multipath_bh *mp_bh)
        md_wakeup_thread(mddev->thread);
 }
 
-
 /*
  * multipath_end_bh_io() is called when we have finished servicing a multipathed
  * operation and are ready to return a success/failure code to the buffer
@@ -98,8 +96,8 @@ static void multipath_end_request(struct bio *bio, int error)
                 */
                char b[BDEVNAME_SIZE];
                md_error (mp_bh->mddev, rdev);
-               printk(KERN_ERR "multipath: %s: rescheduling sector %llu\n", 
-                      bdevname(rdev->bdev,b), 
+               printk(KERN_ERR "multipath: %s: rescheduling sector %llu\n",
+                      bdevname(rdev->bdev,b),
                       (unsigned long long)bio->bi_iter.bi_sector);
                multipath_reschedule_retry(mp_bh);
        } else
@@ -145,12 +143,12 @@ static void multipath_status (struct seq_file *seq, struct mddev *mddev)
 {
        struct mpconf *conf = mddev->private;
        int i;
-       
+
        seq_printf (seq, " [%d/%d] [", conf->raid_disks,
                    conf->raid_disks - mddev->degraded);
        for (i = 0; i < conf->raid_disks; i++)
                seq_printf (seq, "%s",
-                              conf->multipaths[i].rdev && 
+                              conf->multipaths[i].rdev &&
                               test_bit(In_sync, &conf->multipaths[i].rdev->flags) ? "U" : "_");
        seq_printf (seq, "]");
 }
@@ -195,7 +193,7 @@ static void multipath_error (struct mddev *mddev, struct md_rdev *rdev)
                 * first check if this is a queued request for a device
                 * which has just failed.
                 */
-               printk(KERN_ALERT 
+               printk(KERN_ALERT
                       "multipath: only one IO path left and IO error.\n");
                /* leave it active... it's all we have */
                return;
@@ -242,7 +240,6 @@ static void print_multipath_conf (struct mpconf *conf)
        }
 }
 
-
 static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev)
 {
        struct mpconf *conf = mddev->private;
@@ -325,8 +322,6 @@ abort:
        return err;
 }
 
-
-
 /*
  * This is a kernel thread which:
  *
@@ -356,7 +351,7 @@ static void multipathd(struct md_thread *thread)
 
                bio = &mp_bh->bio;
                bio->bi_iter.bi_sector = mp_bh->master_bio->bi_iter.bi_sector;
-               
+
                if ((mp_bh->path = multipath_map (conf))<0) {
                        printk(KERN_ALERT "multipath: %s: unrecoverable IO read"
                                " error for block %llu\n",
@@ -414,7 +409,7 @@ static int multipath_run (struct mddev *mddev)
        conf = kzalloc(sizeof(struct mpconf), GFP_KERNEL);
        mddev->private = conf;
        if (!conf) {
-               printk(KERN_ERR 
+               printk(KERN_ERR
                        "multipath: couldn't allocate memory for %s\n",
                        mdname(mddev));
                goto out;
@@ -423,7 +418,7 @@ static int multipath_run (struct mddev *mddev)
        conf->multipaths = kzalloc(sizeof(struct multipath_info)*mddev->raid_disks,
                                   GFP_KERNEL);
        if (!conf->multipaths) {
-               printk(KERN_ERR 
+               printk(KERN_ERR
                        "multipath: couldn't allocate memory for %s\n",
                        mdname(mddev));
                goto out_free_conf;
@@ -469,7 +464,7 @@ static int multipath_run (struct mddev *mddev)
        conf->pool = mempool_create_kmalloc_pool(NR_RESERVED_BUFS,
                                                 sizeof(struct multipath_bh));
        if (conf->pool == NULL) {
-               printk(KERN_ERR 
+               printk(KERN_ERR
                        "multipath: couldn't allocate memory for %s\n",
                        mdname(mddev));
                goto out_free_conf;
@@ -485,7 +480,7 @@ static int multipath_run (struct mddev *mddev)
                }
        }
 
-       printk(KERN_INFO 
+       printk(KERN_INFO
                "multipath: array %s active with %d out of %d IO paths\n",
                mdname(mddev), conf->raid_disks - mddev->degraded,
               mddev->raid_disks);
@@ -512,7 +507,6 @@ out:
        return -EIO;
 }
 
-
 static int multipath_stop (struct mddev *mddev)
 {
        struct mpconf *conf = mddev->private;