aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi/vtbl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/ubi/vtbl.c')
-rw-r--r--drivers/mtd/ubi/vtbl.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 379f6203783a..fbe2d7ff6cda 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -298,7 +298,7 @@ bad:
298 * This function returns zero in case of success and a negative error code in 298 * This function returns zero in case of success and a negative error code in
299 * case of failure. 299 * case of failure.
300 */ 300 */
301static int create_vtbl(struct ubi_device *ubi, struct ubi_scan_info *si, 301static int create_vtbl(struct ubi_device *ubi, struct ubi_attach_info *si,
302 int copy, void *vtbl) 302 int copy, void *vtbl)
303{ 303{
304 int err, tries = 0; 304 int err, tries = 0;
@@ -373,7 +373,7 @@ out_free:
373 * table in case of success and a negative error code in case of failure. 373 * table in case of success and a negative error code in case of failure.
374 */ 374 */
375static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi, 375static struct ubi_vtbl_record *process_lvol(struct ubi_device *ubi,
376 struct ubi_scan_info *si, 376 struct ubi_attach_info *si,
377 struct ubi_ainf_volume *sv) 377 struct ubi_ainf_volume *sv)
378{ 378{
379 int err; 379 int err;
@@ -496,7 +496,7 @@ out_free:
496 * negative error code in case of failure. 496 * negative error code in case of failure.
497 */ 497 */
498static struct ubi_vtbl_record *create_empty_lvol(struct ubi_device *ubi, 498static struct ubi_vtbl_record *create_empty_lvol(struct ubi_device *ubi,
499 struct ubi_scan_info *si) 499 struct ubi_attach_info *si)
500{ 500{
501 int i; 501 int i;
502 struct ubi_vtbl_record *vtbl; 502 struct ubi_vtbl_record *vtbl;
@@ -531,7 +531,8 @@ static struct ubi_vtbl_record *create_empty_lvol(struct ubi_device *ubi,
531 * Returns zero in case of success and a negative error code in case of 531 * Returns zero in case of success and a negative error code in case of
532 * failure. 532 * failure.
533 */ 533 */
534static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si, 534static int init_volumes(struct ubi_device *ubi,
535 const struct ubi_attach_info *si,
535 const struct ubi_vtbl_record *vtbl) 536 const struct ubi_vtbl_record *vtbl)
536{ 537{
537 int i, reserved_pebs = 0; 538 int i, reserved_pebs = 0;
@@ -712,7 +713,7 @@ bad:
712 * information is OK and %-EINVAL if it is not. 713 * information is OK and %-EINVAL if it is not.
713 */ 714 */
714static int check_scanning_info(const struct ubi_device *ubi, 715static int check_scanning_info(const struct ubi_device *ubi,
715 struct ubi_scan_info *si) 716 struct ubi_attach_info *si)
716{ 717{
717 int err, i; 718 int err, i;
718 struct ubi_ainf_volume *sv; 719 struct ubi_ainf_volume *sv;
@@ -776,7 +777,7 @@ static int check_scanning_info(const struct ubi_device *ubi,
776 * or creates it if needed. Returns zero in case of success and a negative 777 * or creates it if needed. Returns zero in case of success and a negative
777 * error code in case of failure. 778 * error code in case of failure.
778 */ 779 */
779int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_scan_info *si) 780int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *si)
780{ 781{
781 int i, err; 782 int i, err;
782 struct ubi_ainf_volume *sv; 783 struct ubi_ainf_volume *sv;