Merge tag 'mfd-for-linus-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / devices / slram.c

diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 5a5cd2ace4a6b05126e642e06d04950f52108ab8..2fc4957cbe7fec0a2f873cd6cca11cbb88403919 100644 (file)
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -280,14 +280,11 @@ __setup("slram=", mtd_slram_setup);
 static int __init init_slram(void)
 {
        char *devname;
-       int i;
 
 #ifndef MODULE
        char *devstart;
        char *devlength;
 
-       i = 0;
-
        if (!map) {
                E("slram: not enough parameters.\n");
                return(-EINVAL);
@@ -314,6 +311,7 @@ static int __init init_slram(void)
        }
 #else
        int count;
+       int i;
 
        for (count = 0; count < SLRAM_MAX_DEVICES_PARAMS && map[count];
                        count++) {