From: Artem Bityutskiy <dedekind1@gmail.com>
To: MTD Maling List <linux-mtd@lists.infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Subject: [PATCH 11/22] UBI: rename ubi_scan_find_av
Date: Fri, 18 May 2012 14:03:54 +0300 [thread overview]
Message-ID: <1337339045-8199-12-git-send-email-dedekind1@gmail.com> (raw)
In-Reply-To: <1337339045-8199-1-git-send-email-dedekind1@gmail.com>
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
The old name is not logical anymore - rename it to 'ubi_find_av()'.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---
drivers/mtd/ubi/eba.c | 2 +-
drivers/mtd/ubi/scan.c | 6 +++---
drivers/mtd/ubi/scan.h | 4 ++--
drivers/mtd/ubi/vtbl.c | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 572281a..6f7f275 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -1246,7 +1246,7 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai)
for (j = 0; j < vol->reserved_pebs; j++)
vol->eba_tbl[j] = UBI_LEB_UNMAPPED;
- av = ubi_scan_find_av(ai, idx2vol_id(ubi, i));
+ av = ubi_find_av(ai, idx2vol_id(ubi, i));
if (!av)
continue;
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index 3665062..767b857 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -585,15 +585,15 @@ int ubi_add_to_av(struct ubi_device *ubi, struct ubi_attach_info *ai, int pnum,
}
/**
- * ubi_scan_find_av - find volume in the attaching information.
+ * ubi_find_av - find volume in the attaching information.
* @ai: attaching information
* @vol_id: the requested volume ID
*
* This function returns a pointer to the volume description or %NULL if there
* are no data about this volume in the attaching information.
*/
-struct ubi_ainf_volume *ubi_scan_find_av(const struct ubi_attach_info *ai,
- int vol_id)
+struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,
+ int vol_id)
{
struct ubi_ainf_volume *av;
struct rb_node *p = ai->volumes.rb_node;
diff --git a/drivers/mtd/ubi/scan.h b/drivers/mtd/ubi/scan.h
index 5a9ecc0..b1eeb0b 100644
--- a/drivers/mtd/ubi/scan.h
+++ b/drivers/mtd/ubi/scan.h
@@ -159,8 +159,8 @@ static inline void ubi_scan_move_to_list(struct ubi_ainf_volume *av,
int ubi_add_to_av(struct ubi_device *ubi, struct ubi_attach_info *ai, int pnum,
int ec, const struct ubi_vid_hdr *vid_hdr, int bitflips);
-struct ubi_ainf_volume *ubi_scan_find_av(const struct ubi_attach_info *ai,
- int vol_id);
+struct ubi_ainf_volume *ubi_find_av(const struct ubi_attach_info *ai,
+ int vol_id);
void ubi_scan_rm_volume(struct ubi_attach_info *ai, struct ubi_ainf_volume *av);
struct ubi_ainf_peb *ubi_scan_get_free_peb(struct ubi_device *ubi,
struct ubi_attach_info *ai);
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 5decd58..0c8c172 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -591,7 +591,7 @@ static int init_volumes(struct ubi_device *ubi,
}
/* Static volumes only */
- av = ubi_scan_find_av(ai, i);
+ av = ubi_find_av(ai, i);
if (!av) {
/*
* No eraseblocks belonging to this volume found. We
@@ -734,7 +734,7 @@ static int check_scanning_info(const struct ubi_device *ubi,
for (i = 0; i < ubi->vtbl_slots + UBI_INT_VOL_COUNT; i++) {
cond_resched();
- av = ubi_scan_find_av(ai, i);
+ av = ubi_find_av(ai, i);
vol = ubi->volumes[i];
if (!vol) {
if (av)
@@ -794,7 +794,7 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai)
ubi->vtbl_size = ubi->vtbl_slots * UBI_VTBL_RECORD_SIZE;
ubi->vtbl_size = ALIGN(ubi->vtbl_size, ubi->min_io_size);
- av = ubi_scan_find_av(ai, UBI_LAYOUT_VOLUME_ID);
+ av = ubi_find_av(ai, UBI_LAYOUT_VOLUME_ID);
if (!av) {
/*
* No logical eraseblocks belonging to the layout volume were
--
1.7.10
next prev parent reply other threads:[~2012-05-18 11:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 11:03 [PATCH 00/22] UBI: massage for fastmap Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 01/22] UBI: rename struct ubi_scan_leb Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 02/22] UBI: rename struct ubi_scan_volume Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 03/22] UBI: rename struct ubi_scan_info Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 04/22] UBI: amend comments after renaming in scan.c Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 05/22] UBI: rename seb to aeb Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 06/22] UBI: rename si to ai Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 07/22] UBI: rename sv to av Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 08/22] UBI: make ubi_scan_erase_peb static and rename Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 09/22] UBI: remove unused function Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 10/22] UBI: rename ubi_scan_add_used Artem Bityutskiy
2012-05-18 11:03 ` Artem Bityutskiy [this message]
2012-05-18 11:03 ` [PATCH 12/22] UBI: rename ubi_scan_rm_volume Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 13/22] UBI: rename ubi_scan_get_free_peb Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 14/22] UBI: rename ubi_scan_destroy_ai Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 15/22] UBI: rename ubi_scan_move_to_list Artem Bityutskiy
2012-05-18 11:03 ` [PATCH 16/22] UBI: rename ubi_scan_leb_slab Artem Bityutskiy
2012-05-18 11:04 ` [PATCH 17/22] UBI: amend comments after all the renamings Artem Bityutskiy
2012-05-18 11:04 ` [PATCH 18/22] UBI: rename _init_scan functions Artem Bityutskiy
2012-05-18 11:04 ` [PATCH 19/22] UBI: move and rename attach_by_scanning Artem Bityutskiy
2012-05-18 11:04 ` [PATCH 20/22] UBI: rename UBI_SCAN_UNKNOWN_EC Artem Bityutskiy
2012-05-18 11:04 ` [PATCH 21/22] UBI: remove scan.h Artem Bityutskiy
2012-05-18 11:04 ` [PATCH 22/22] UBI: rename scan.c to attach.c Artem Bityutskiy
2012-05-18 17:24 ` [PATCH 00/22] UBI: massage for fastmap Richard Weinberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337339045-8199-12-git-send-email-dedekind1@gmail.com \
--to=dedekind1@gmail.com \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).