diff options
| author | danh-arm <dan.handley@arm.com> | 2018-07-19 17:11:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 17:11:32 +0100 |
| commit | ba0248b52d8027e0f38cf44353f8860bbf171b2d (patch) | |
| tree | 5194aa0930d9d937bef65bfb96f2e64e11e4bde3 /drivers/io | |
| parent | 992a35361373264a9d3bf9b23976269c72c3cbe1 (diff) | |
| parent | 23e0fe52de7ba13243f54198af62d4ba6c70d3be (diff) | |
Merge pull request #1450 from MISL-EBU-System-SW/marvell-support-v6
Marvell support for Armada 8K SoC family
Diffstat (limited to 'drivers/io')
| -rw-r--r-- | drivers/io/io_fip.c | 1 | ||||
| -rw-r--r-- | drivers/io/io_memmap.c | 3 | ||||
| -rw-r--r-- | drivers/io/io_semihosting.c | 3 | ||||
| -rw-r--r-- | drivers/io/io_storage.c | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c index 6e7103db..9d6c763e 100644 --- a/drivers/io/io_fip.c +++ b/drivers/io/io_fip.c @@ -372,7 +372,6 @@ static int fip_file_read(io_entity_t *entity, uintptr_t buffer, size_t length, uintptr_t backend_handle; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_read != NULL); assert(entity->info != (uintptr_t)NULL); diff --git a/drivers/io/io_memmap.c b/drivers/io/io_memmap.c index bf59d6a5..5595e60a 100644 --- a/drivers/io/io_memmap.c +++ b/drivers/io/io_memmap.c @@ -9,6 +9,7 @@ #include <io_driver.h> #include <io_memmap.h> #include <io_storage.h> +#include <platform_def.h> #include <string.h> #include <utils.h> @@ -169,7 +170,6 @@ static int memmap_block_read(io_entity_t *entity, uintptr_t buffer, size_t pos_after; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_read != NULL); fp = (file_state_t *) entity->info; @@ -197,7 +197,6 @@ static int memmap_block_write(io_entity_t *entity, const uintptr_t buffer, size_t pos_after; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_written != NULL); fp = (file_state_t *) entity->info; diff --git a/drivers/io/io_semihosting.c b/drivers/io/io_semihosting.c index 4abf44f7..9ca0a9dc 100644 --- a/drivers/io/io_semihosting.c +++ b/drivers/io/io_semihosting.c @@ -8,6 +8,7 @@ #include <io_driver.h> #include <io_semihosting.h> #include <io_storage.h> +#include <platform_def.h> #include <semihosting.h> @@ -133,7 +134,6 @@ static int sh_file_read(io_entity_t *entity, uintptr_t buffer, size_t length, long file_handle; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_read != NULL); file_handle = (long)entity->info; @@ -158,7 +158,6 @@ static int sh_file_write(io_entity_t *entity, const uintptr_t buffer, size_t bytes = length; assert(entity != NULL); - assert(buffer != (uintptr_t)NULL); assert(length_written != NULL); file_handle = (long)entity->info; diff --git a/drivers/io/io_storage.c b/drivers/io/io_storage.c index 0918de0a..948f8481 100644 --- a/drivers/io/io_storage.c +++ b/drivers/io/io_storage.c @@ -279,7 +279,7 @@ int io_read(uintptr_t handle, size_t *length_read) { int result = -ENODEV; - assert(is_valid_entity(handle) && (buffer != (uintptr_t)NULL)); + assert(is_valid_entity(handle)); io_entity_t *entity = (io_entity_t *)handle; @@ -299,7 +299,7 @@ int io_write(uintptr_t handle, size_t *length_written) { int result = -ENODEV; - assert(is_valid_entity(handle) && (buffer != (uintptr_t)NULL)); + assert(is_valid_entity(handle)); io_entity_t *entity = (io_entity_t *)handle; |