summaryrefslogtreecommitdiffstats
path: root/common/bbu.c
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-10-07 23:35:15 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2018-10-08 10:07:12 +0200
commit76b44a34fc00772319395a84e67b8f816804f5bc (patch)
treeb3034a3c8288abe4191ae154dbafb14ebd9e6de4 /common/bbu.c
parentb73bc6e3035933e796564ba962c71d5775554f86 (diff)
downloadbarebox-76b44a34fc00772319395a84e67b8f816804f5bc.tar.gz
barebox-76b44a34fc00772319395a84e67b8f816804f5bc.tar.xz
bbu: Expose bbu_find_handler_by_*() functions
Expose bbu_find_handler_by_device() and bbu_find_handler_by_name() as public functions and convert the only user of barebox_update_handler_exists() to use the former function instead. With this done, barebox_update_handler_exists() is no longer used anywhere in the code and can be removed. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/bbu.c')
-rw-r--r--common/bbu.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/common/bbu.c b/common/bbu.c
index 3974bf6729..fabd949664 100644
--- a/common/bbu.c
+++ b/common/bbu.c
@@ -99,7 +99,7 @@ int bbu_confirm(struct bbu_data *data)
return -EINTR;
}
-static struct bbu_handler *bbu_find_handler(const char *name)
+struct bbu_handler *bbu_find_handler_by_name(const char *name)
{
struct bbu_handler *handler;
@@ -117,7 +117,7 @@ static struct bbu_handler *bbu_find_handler(const char *name)
return NULL;
}
-static struct bbu_handler *bbu_find_handler_by_device(const char *devicepath)
+struct bbu_handler *bbu_find_handler_by_device(const char *devicepath)
{
struct bbu_handler *handler;
@@ -140,20 +140,6 @@ static struct bbu_handler *bbu_find_handler_by_device(const char *devicepath)
return NULL;
}
-bool barebox_update_handler_exists(struct bbu_data *data)
-{
- struct bbu_handler *handler;
-
- handler = bbu_find_handler_by_device(data->devicefile);
- if (handler)
- return true;
-
- if (!data->handler_name)
- return false;
-
- return bbu_find_handler(data->handler_name) != NULL;
-}
-
static int bbu_check_of_compat(struct bbu_data *data)
{
struct device_node *root_node;
@@ -238,7 +224,7 @@ int barebox_update(struct bbu_data *data)
handler = bbu_find_handler_by_device(data->devicefile);
if (!handler)
- handler = bbu_find_handler(data->handler_name);
+ handler = bbu_find_handler_by_name(data->handler_name);
if (!handler)
return -ENODEV;
@@ -292,11 +278,11 @@ void bbu_handlers_list(void)
*/
int bbu_register_handler(struct bbu_handler *handler)
{
- if (bbu_find_handler(handler->name))
+ if (bbu_find_handler_by_name(handler->name))
return -EBUSY;
if (handler->flags & BBU_HANDLER_FLAG_DEFAULT &&
- bbu_find_handler(NULL))
+ bbu_find_handler_by_name(NULL))
return -EBUSY;
list_add_tail(&handler->list, &bbu_image_handlers);