diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-04-05 11:23:44 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-05-26 11:45:44 -0400 |
commit | b90cf6681f4f6263920616e7ca2fd09130e4143a (patch) | |
tree | a42bb320a9fa457141f23b804389c8625677ada7 /drivers/mtd | |
parent | 4704a78472cd5c58f6b4c4f8c04d32de2da3f20a (diff) |
[MTD] Remove option for add_mtd_partitions() to not register partitions.
This breaks the dilnetpc map driver, but it could be fixed not to use
that option. We want to simplify the partition handling, and this is a
step towards that.
Remove superfluous 'index' field from private struct mtd_part too, while
we're at it.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/mtdpart.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 63d1cd2c17be..349fcbe5cc0f 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c | |||
@@ -27,9 +27,7 @@ struct mtd_part { | |||
27 | struct mtd_info mtd; | 27 | struct mtd_info mtd; |
28 | struct mtd_info *master; | 28 | struct mtd_info *master; |
29 | uint64_t offset; | 29 | uint64_t offset; |
30 | int index; | ||
31 | struct list_head list; | 30 | struct list_head list; |
32 | int registered; | ||
33 | }; | 31 | }; |
34 | 32 | ||
35 | /* | 33 | /* |
@@ -321,8 +319,7 @@ int del_mtd_partitions(struct mtd_info *master) | |||
321 | list_for_each_entry_safe(slave, next, &mtd_partitions, list) | 319 | list_for_each_entry_safe(slave, next, &mtd_partitions, list) |
322 | if (slave->master == master) { | 320 | if (slave->master == master) { |
323 | list_del(&slave->list); | 321 | list_del(&slave->list); |
324 | if (slave->registered) | 322 | del_mtd_device(&slave->mtd); |
325 | del_mtd_device(&slave->mtd); | ||
326 | kfree(slave); | 323 | kfree(slave); |
327 | } | 324 | } |
328 | 325 | ||
@@ -412,7 +409,6 @@ static struct mtd_part *add_one_partition(struct mtd_info *master, | |||
412 | slave->mtd.erase = part_erase; | 409 | slave->mtd.erase = part_erase; |
413 | slave->master = master; | 410 | slave->master = master; |
414 | slave->offset = part->offset; | 411 | slave->offset = part->offset; |
415 | slave->index = partno; | ||
416 | 412 | ||
417 | if (slave->offset == MTDPART_OFS_APPEND) | 413 | if (slave->offset == MTDPART_OFS_APPEND) |
418 | slave->offset = cur_offset; | 414 | slave->offset = cur_offset; |
@@ -500,15 +496,9 @@ static struct mtd_part *add_one_partition(struct mtd_info *master, | |||
500 | } | 496 | } |
501 | 497 | ||
502 | out_register: | 498 | out_register: |
503 | if (part->mtdp) { | 499 | /* register our partition */ |
504 | /* store the object pointer (caller may or may not register it*/ | 500 | add_mtd_device(&slave->mtd); |
505 | *part->mtdp = &slave->mtd; | 501 | |
506 | slave->registered = 0; | ||
507 | } else { | ||
508 | /* register our partition */ | ||
509 | add_mtd_device(&slave->mtd); | ||
510 | slave->registered = 1; | ||
511 | } | ||
512 | return slave; | 502 | return slave; |
513 | } | 503 | } |
514 | 504 | ||