From 4a19faded442d1725b7ad39211713c5c7b065e88 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Thu, 17 May 2012 15:53:10 +0300 Subject: [PATCH] --- yaml --- r: 305179 b: refs/heads/master c: 0bae2887a725767bf00434fae18387818f8cc931 h: refs/heads/master i: 305177: f77e7ff43e079cd366fda3c97de3260ef0953039 305175: 43df331215a12b2d295ca7d2e5ef9ae1fd2739da v: v3 --- [refs] | 2 +- trunk/drivers/mtd/ubi/eba.c | 2 +- trunk/drivers/mtd/ubi/scan.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 21a00587f4cd..76716f0da35c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66a2af3824d856684b9865f140998a134eb4c6d8 +refs/heads/master: 0bae2887a725767bf00434fae18387818f8cc931 diff --git a/trunk/drivers/mtd/ubi/eba.c b/trunk/drivers/mtd/ubi/eba.c index 6f7f27566524..2592d1cc288e 100644 --- a/trunk/drivers/mtd/ubi/eba.c +++ b/trunk/drivers/mtd/ubi/eba.c @@ -1256,7 +1256,7 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai) * This may happen in case of an unclean reboot * during re-size. */ - ubi_scan_move_to_list(av, aeb, &ai->erase); + ubi_move_aeb_to_list(av, aeb, &ai->erase); vol->eba_tbl[aeb->lnum] = aeb->pnum; } } diff --git a/trunk/drivers/mtd/ubi/scan.h b/trunk/drivers/mtd/ubi/scan.h index a406f5b4ffeb..aa76b3b5c6b5 100644 --- a/trunk/drivers/mtd/ubi/scan.h +++ b/trunk/drivers/mtd/ubi/scan.h @@ -143,13 +143,13 @@ struct ubi_device; struct ubi_vid_hdr; /* - * ubi_scan_move_to_list - move a PEB from the volume tree to a list. + * ubi_move_aeb_to_list - move a PEB from the volume tree to a list. * * @av: volume attaching information * @aeb: scanning eraseblock information * @list: the list to move to */ -static inline void ubi_scan_move_to_list(struct ubi_ainf_volume *av, +static inline void ubi_move_aeb_to_list(struct ubi_ainf_volume *av, struct ubi_ainf_peb *aeb, struct list_head *list) {