Fix static analysis errors
Fix checkpatch and cppcheck findings in newly added FWU files.
Change-Id: Ie6a877e65b758399647ceda345ae22081d911f8e
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
diff --git a/components/media/volume/volume.c b/components/media/volume/volume.c
index b043376..aa17c26 100644
--- a/components/media/volume/volume.c
+++ b/components/media/volume/volume.c
@@ -4,14 +4,13 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <errno.h>
-#include <stddef.h>
#include "volume.h"
-void volume_init(
- struct volume *this_volume,
- const io_dev_funcs_t *io_dev_funcs,
- uintptr_t concrete_volume)
+#include <errno.h>
+#include <stddef.h>
+
+void volume_init(struct volume *this_volume, const io_dev_funcs_t *io_dev_funcs,
+ uintptr_t concrete_volume)
{
this_volume->dev_info.funcs = io_dev_funcs;
this_volume->dev_info.info = concrete_volume;
@@ -26,70 +25,48 @@
this_volume->get_storage_ids = NULL;
}
-int volume_open(
- struct volume *this_volume)
+int volume_open(struct volume *this_volume)
{
- return io_open(
- this_volume->dev_handle,
- this_volume->io_spec,
- &this_volume->io_handle);
+ return io_open(this_volume->dev_handle, this_volume->io_spec, &this_volume->io_handle);
}
-int volume_close(
- struct volume *this_volume)
+int volume_close(struct volume *this_volume)
{
return io_close(this_volume->io_handle);
}
-int volume_seek(
- struct volume *this_volume,
- io_seek_mode_t mode,
- signed long long offset)
+int volume_seek(struct volume *this_volume, io_seek_mode_t mode, signed long long offset)
{
return io_seek(this_volume->io_handle, mode, offset);
}
-int volume_size(
- struct volume *this_volume,
- size_t *size)
+int volume_size(struct volume *this_volume, size_t *size)
{
return io_size(this_volume->io_handle, size);
}
-int volume_read(
- struct volume *this_volume,
- uintptr_t buffer,
- size_t length,
- size_t *length_read)
+int volume_read(struct volume *this_volume, uintptr_t buffer, size_t length, size_t *length_read)
{
return io_read(this_volume->io_handle, buffer, length, length_read);
}
-int volume_write(
- struct volume *this_volume,
- const uintptr_t buffer,
- size_t length,
- size_t *length_written)
+int volume_write(struct volume *this_volume, const uintptr_t buffer, size_t length,
+ size_t *length_written)
{
return io_write(this_volume->io_handle, buffer, length, length_written);
}
-int volume_erase(
- struct volume *this_volume)
+int volume_erase(struct volume *this_volume)
{
- return (this_volume->erase) ?
- this_volume->erase(this_volume->dev_info.info) : 0;
+ return (this_volume->erase) ? this_volume->erase(this_volume->dev_info.info) : 0;
}
-int volume_get_storage_ids(
- struct volume *this_volume,
- struct uuid_octets *partition_guid,
- struct uuid_octets *parent_guid)
+int volume_get_storage_ids(struct volume *this_volume, struct uuid_octets *partition_guid,
+ struct uuid_octets *parent_guid)
{
if (this_volume->get_storage_ids)
- return this_volume->get_storage_ids(
- this_volume->dev_info.info,
- partition_guid, parent_guid);
+ return this_volume->get_storage_ids(this_volume->dev_info.info, partition_guid,
+ parent_guid);
return -EIO;
}