diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-06-02 10:01:07 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:13 -0400 |
commit | b2a5a4878e97119e3b64d4646fd138820d513c28 (patch) | |
tree | 2e2f1de796dd286a61e3b725a4b0f887a70a259f /drivers/mtd/nand/socrates_nand.c | |
parent | a9106497082c5b9d2b367159573127c2c9ced4b6 (diff) |
mtd: socrates_nand.c: use mtd_device_parse_register
Replace custom invocations of parse_mtd_partitions and mtd_device_register
with common mtd_device_parse_register call. This would bring: standard
handling of all errors, fallback to default partitions, etc.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
Diffstat (limited to 'drivers/mtd/nand/socrates_nand.c')
-rw-r--r-- | drivers/mtd/nand/socrates_nand.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c index f4f79ecb5ba..0fb24f9c232 100644 --- a/drivers/mtd/nand/socrates_nand.c +++ b/drivers/mtd/nand/socrates_nand.c | |||
@@ -164,8 +164,6 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev) | |||
164 | struct mtd_info *mtd; | 164 | struct mtd_info *mtd; |
165 | struct nand_chip *nand_chip; | 165 | struct nand_chip *nand_chip; |
166 | int res; | 166 | int res; |
167 | struct mtd_partition *partitions = NULL; | ||
168 | int num_partitions = 0; | ||
169 | struct mtd_part_parser_data ppdata; | 167 | struct mtd_part_parser_data ppdata; |
170 | 168 | ||
171 | /* Allocate memory for the device structure (and zero it) */ | 169 | /* Allocate memory for the device structure (and zero it) */ |
@@ -225,17 +223,10 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev) | |||
225 | goto out; | 223 | goto out; |
226 | } | 224 | } |
227 | 225 | ||
228 | num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, &ppdata); | 226 | res = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0); |
229 | if (num_partitions < 0) { | ||
230 | res = num_partitions; | ||
231 | goto release; | ||
232 | } | ||
233 | |||
234 | res = mtd_device_register(mtd, partitions, num_partitions); | ||
235 | if (!res) | 227 | if (!res) |
236 | return res; | 228 | return res; |
237 | 229 | ||
238 | release: | ||
239 | nand_release(mtd); | 230 | nand_release(mtd); |
240 | 231 | ||
241 | out: | 232 | out: |