disk: part: use common api to lookup part driver
Do not need to scan disk every time when we get part info by name. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> [trini: Fix build in !CONFIG_HAVE_BLOCK_DEVICE case] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
d472926919
commit
56670d6fb8
1 changed files with 16 additions and 19 deletions
35
disk/part.c
35
disk/part.c
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
#ifdef CONFIG_HAVE_BLOCK_DEVICE
|
|
||||||
static struct part_driver *part_driver_lookup_type(struct blk_desc *dev_desc)
|
static struct part_driver *part_driver_lookup_type(struct blk_desc *dev_desc)
|
||||||
{
|
{
|
||||||
struct part_driver *drv =
|
struct part_driver *drv =
|
||||||
|
@ -55,6 +54,7 @@ static struct part_driver *part_driver_lookup_type(struct blk_desc *dev_desc)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_HAVE_BLOCK_DEVICE
|
||||||
static struct blk_desc *get_dev_hwpart(const char *ifname, int dev, int hwpart)
|
static struct blk_desc *get_dev_hwpart(const char *ifname, int dev, int hwpart)
|
||||||
{
|
{
|
||||||
struct blk_desc *dev_desc;
|
struct blk_desc *dev_desc;
|
||||||
|
@ -644,28 +644,25 @@ cleanup:
|
||||||
int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name,
|
int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name,
|
||||||
disk_partition_t *info, int part_type)
|
disk_partition_t *info, int part_type)
|
||||||
{
|
{
|
||||||
struct part_driver *first_drv =
|
|
||||||
ll_entry_start(struct part_driver, part_driver);
|
|
||||||
const int n_drvs = ll_entry_count(struct part_driver, part_driver);
|
|
||||||
struct part_driver *part_drv;
|
struct part_driver *part_drv;
|
||||||
|
int ret;
|
||||||
|
int i;
|
||||||
|
|
||||||
for (part_drv = first_drv; part_drv != first_drv + n_drvs; part_drv++) {
|
part_drv = part_driver_lookup_type(dev_desc);
|
||||||
int ret;
|
if (!part_drv)
|
||||||
int i;
|
return -1;
|
||||||
for (i = 1; i < part_drv->max_entries; i++) {
|
for (i = 1; i < part_drv->max_entries; i++) {
|
||||||
if (part_type >= 0 && part_type != part_drv->part_type)
|
ret = part_drv->get_info(dev_desc, i, info);
|
||||||
break;
|
if (ret != 0) {
|
||||||
ret = part_drv->get_info(dev_desc, i, info);
|
/* no more entries in table */
|
||||||
if (ret != 0) {
|
break;
|
||||||
/* no more entries in table */
|
}
|
||||||
break;
|
if (strcmp(name, (const char *)info->name) == 0) {
|
||||||
}
|
/* matched */
|
||||||
if (strcmp(name, (const char *)info->name) == 0) {
|
return i;
|
||||||
/* matched */
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue