diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-07-09 22:26:37 +0900 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-07-09 22:27:47 +0900 |
commit | a1ab463a9d6834c4b15db6594e86eecb55973cae (patch) | |
tree | 8fdcb785a0f39dc31929a70fafec81be15156b40 /drivers/io | |
parent | 99c447f4406c8ae66b6cab2341ef0c8e8d9751d2 (diff) | |
download | arm-trusted-firmware-a1ab463a9d6834c4b15db6594e86eecb55973cae.tar.gz |
io_storage: remove redundant assigments
The assignments to 'result' are unneeded.
Change-Id: I18899f10bf9bd7f219f0e47a981683d8b4701bde
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers/io')
-rw-r--r-- | drivers/io/io_storage.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/io/io_storage.c b/drivers/io/io_storage.c index b8c1d6479..ba6f094c4 100644 --- a/drivers/io/io_storage.c +++ b/drivers/io/io_storage.c @@ -34,8 +34,7 @@ static unsigned int dev_count; /* Return a boolean value indicating whether a device connector is valid */ static int is_valid_dev_connector(const io_dev_connector_t *dev_con) { - int result = (dev_con != NULL) && (dev_con->dev_open != NULL); - return result; + return (dev_con != NULL) && (dev_con->dev_open != NULL); } @@ -43,10 +42,10 @@ static int is_valid_dev_connector(const io_dev_connector_t *dev_con) static int is_valid_dev(const uintptr_t dev_handle) { const io_dev_info_t *dev = (io_dev_info_t *)dev_handle; - int result = (dev != NULL) && (dev->funcs != NULL) && + + return (dev != NULL) && (dev->funcs != NULL) && (dev->funcs->type != NULL) && (dev->funcs->type() < IO_TYPE_MAX); - return result; } @@ -54,9 +53,9 @@ static int is_valid_dev(const uintptr_t dev_handle) static int is_valid_entity(const uintptr_t handle) { const io_entity_t *entity = (io_entity_t *)handle; - int result = (entity != NULL) && + + return (entity != NULL) && (is_valid_dev((uintptr_t)entity->dev_handle)); - return result; } @@ -74,12 +73,10 @@ static int is_valid_seek_mode(io_seek_mode_t mode) static int dev_open(const io_dev_connector_t *dev_con, const uintptr_t dev_spec, io_dev_info_t **dev_info) { - int result; assert(dev_info != NULL); assert(is_valid_dev_connector(dev_con)); - result = dev_con->dev_open(dev_spec, dev_info); - return result; + return dev_con->dev_open(dev_spec, dev_info); } @@ -163,11 +160,9 @@ int io_register_device(const io_dev_info_t *dev_info) int io_dev_open(const io_dev_connector_t *dev_con, const uintptr_t dev_spec, uintptr_t *handle) { - int result; assert(handle != NULL); - result = dev_open(dev_con, dev_spec, (io_dev_info_t **)handle); - return result; + return dev_open(dev_con, dev_spec, (io_dev_info_t **)handle); } |