diff options
Diffstat (limited to 'drivers/mtd/maps/mainstone-flash.c')
-rw-r--r-- | drivers/mtd/maps/mainstone-flash.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/mtd/maps/mainstone-flash.c b/drivers/mtd/maps/mainstone-flash.c index da0f8a692628..eaa4bbb868a3 100644 --- a/drivers/mtd/maps/mainstone-flash.c +++ b/drivers/mtd/maps/mainstone-flash.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Author: Nicolas Pitre | 6 | * Author: Nicolas Pitre |
7 | * Copyright: (C) 2001 MontaVista Software Inc. | 7 | * Copyright: (C) 2001 MontaVista Software Inc. |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
@@ -91,27 +91,27 @@ static int __init init_mainstone(void) | |||
91 | mainstone_maps[i].virt = ioremap(mainstone_maps[i].phys, | 91 | mainstone_maps[i].virt = ioremap(mainstone_maps[i].phys, |
92 | WINDOW_SIZE); | 92 | WINDOW_SIZE); |
93 | if (!mainstone_maps[i].virt) { | 93 | if (!mainstone_maps[i].virt) { |
94 | printk(KERN_WARNING "Failed to ioremap %s\n", | 94 | printk(KERN_WARNING "Failed to ioremap %s\n", |
95 | mainstone_maps[i].name); | 95 | mainstone_maps[i].name); |
96 | if (!ret) | 96 | if (!ret) |
97 | ret = -ENOMEM; | 97 | ret = -ENOMEM; |
98 | continue; | 98 | continue; |
99 | } | 99 | } |
100 | mainstone_maps[i].cached = | 100 | mainstone_maps[i].cached = |
101 | ioremap_cached(mainstone_maps[i].phys, WINDOW_SIZE); | 101 | ioremap_cached(mainstone_maps[i].phys, WINDOW_SIZE); |
102 | if (!mainstone_maps[i].cached) | 102 | if (!mainstone_maps[i].cached) |
103 | printk(KERN_WARNING "Failed to ioremap cached %s\n", | 103 | printk(KERN_WARNING "Failed to ioremap cached %s\n", |
104 | mainstone_maps[i].name); | 104 | mainstone_maps[i].name); |
105 | simple_map_init(&mainstone_maps[i]); | 105 | simple_map_init(&mainstone_maps[i]); |
106 | 106 | ||
107 | printk(KERN_NOTICE | 107 | printk(KERN_NOTICE |
108 | "Probing %s at physical address 0x%08lx" | 108 | "Probing %s at physical address 0x%08lx" |
109 | " (%d-bit bankwidth)\n", | 109 | " (%d-bit bankwidth)\n", |
110 | mainstone_maps[i].name, mainstone_maps[i].phys, | 110 | mainstone_maps[i].name, mainstone_maps[i].phys, |
111 | mainstone_maps[i].bankwidth * 8); | 111 | mainstone_maps[i].bankwidth * 8); |
112 | 112 | ||
113 | mymtds[i] = do_map_probe("cfi_probe", &mainstone_maps[i]); | 113 | mymtds[i] = do_map_probe("cfi_probe", &mainstone_maps[i]); |
114 | 114 | ||
115 | if (!mymtds[i]) { | 115 | if (!mymtds[i]) { |
116 | iounmap((void *)mainstone_maps[i].virt); | 116 | iounmap((void *)mainstone_maps[i].virt); |
117 | if (mainstone_maps[i].cached) | 117 | if (mainstone_maps[i].cached) |
@@ -131,21 +131,21 @@ static int __init init_mainstone(void) | |||
131 | 131 | ||
132 | if (!mymtds[0] && !mymtds[1]) | 132 | if (!mymtds[0] && !mymtds[1]) |
133 | return ret; | 133 | return ret; |
134 | 134 | ||
135 | for (i = 0; i < 2; i++) { | 135 | for (i = 0; i < 2; i++) { |
136 | if (!mymtds[i]) { | 136 | if (!mymtds[i]) { |
137 | printk(KERN_WARNING "%s is absent. Skipping\n", | 137 | printk(KERN_WARNING "%s is absent. Skipping\n", |
138 | mainstone_maps[i].name); | 138 | mainstone_maps[i].name); |
139 | } else if (nr_parsed_parts[i]) { | 139 | } else if (nr_parsed_parts[i]) { |
140 | add_mtd_partitions(mymtds[i], parsed_parts[i], | 140 | add_mtd_partitions(mymtds[i], parsed_parts[i], |
141 | nr_parsed_parts[i]); | 141 | nr_parsed_parts[i]); |
142 | } else if (!i) { | 142 | } else if (!i) { |
143 | printk("Using static partitions on %s\n", | 143 | printk("Using static partitions on %s\n", |
144 | mainstone_maps[i].name); | 144 | mainstone_maps[i].name); |
145 | add_mtd_partitions(mymtds[i], mainstone_partitions, | 145 | add_mtd_partitions(mymtds[i], mainstone_partitions, |
146 | ARRAY_SIZE(mainstone_partitions)); | 146 | ARRAY_SIZE(mainstone_partitions)); |
147 | } else { | 147 | } else { |
148 | printk("Registering %s as whole device\n", | 148 | printk("Registering %s as whole device\n", |
149 | mainstone_maps[i].name); | 149 | mainstone_maps[i].name); |
150 | add_mtd_device(mymtds[i]); | 150 | add_mtd_device(mymtds[i]); |
151 | } | 151 | } |