From 8dd1cd2104ea4001e4a0da2a4851ccd62c82f8e8 Mon Sep 17 00:00:00 2001
From: Ben Walker <benjamin.walker@intel.com>
Date: Wed, 22 Jun 2022 14:35:04 -0700
Subject: [PATCH] check_format: For C files only, fix return type breaks

In SPDK, declarations have the return type on the same line. Definitions
have the return type on a separate line. Astyle has an option for
enforcing this. Unfortunately, it seems to have two bugs:

1) It doesn't work correctly at all on C++ files.
2) It often fails on functions that return enums, or long type names

Deal with 1) by adjusting the check_format.sh script to only tell astyle
to fix return type line breaks for C files and not C++. Deal with 2) by
adding a few typedefs to work around the problem.

Change-Id: Idf28281466cab8411ce252d5f02ab384166790c6
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13437
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Dong Yi <dongx.yi@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
---
 app/iscsi_top/iscsi_top.c                     |   6 +-
 app/spdk_dd/spdk_dd.c                         |   3 +-
 app/spdk_top/spdk_top.c                       |   3 +-
 app/trace/trace.cpp                           |   6 +-
 app/trace_record/trace_record.c               |   6 +-
 examples/bdev/fio_plugin/fio_plugin.c         |  11 +-
 examples/bdev/hello_world/hello_bdev.c        |   3 +-
 examples/ioat/verify/verify.c                 |   3 +-
 examples/nvme/abort/abort.c                   |   3 +-
 examples/nvme/cmb_copy/cmb_copy.c             |   3 +-
 examples/nvme/discovery_aer/discovery_aer.c   |   6 +-
 examples/nvme/fio_plugin/fio_plugin.c         |  55 ++--
 examples/nvme/hello_world/hello_world.c       |   3 +-
 examples/nvme/hotplug/hotplug.c               |  14 +-
 examples/nvme/identify/identify.c             |   3 +-
 examples/nvme/nvme_manage/nvme_manage.c       |   6 +-
 examples/nvme/perf/perf.c                     |   9 +-
 .../nvme/pmr_persistence/pmr_persistence.c    |   3 +-
 examples/nvme/reconnect/reconnect.c           |   9 +-
 examples/nvmf/nvmf/nvmf.c                     |   3 +-
 examples/sock/hello_world/hello_sock.c        |   3 +-
 examples/vmd/lsvmd/lsvmd.c                    |   3 +-
 include/linux/virtio_ring.h                   |  11 +-
 include/spdk/nvmf_transport.h                 |   3 +-
 include/spdk_internal/rdma.h                  |  10 +-
 include/spdk_internal/virtio.h                |   3 +-
 lib/accel/accel_engine.c                      |   6 +-
 lib/bdev/bdev.c                               |  74 ++---
 lib/blob/blobstore.c                          | 107 ++++---
 lib/dma/dma.c                                 |   6 +-
 lib/env_dpdk/env.c                            |  12 +-
 lib/env_ocf/mpool.c                           |  16 +-
 lib/env_ocf/ocf_env.c                         |  15 +-
 lib/env_ocf/ocf_env.h                         | 300 ++++++++++++------
 lib/env_ocf/ocf_env_list.h                    |  22 +-
 lib/ftl/ftl_io.c                              |   3 +-
 lib/ftl/ftl_restore.c                         |   9 +-
 lib/ioat/ioat.c                               |   3 +-
 lib/iscsi/conn.c                              |   3 +-
 lib/iscsi/iscsi.c                             |  18 +-
 lib/iscsi/iscsi_subsystem.c                   |   3 +-
 lib/iscsi/md5.c                               |   9 +-
 lib/iscsi/param.h                             |  32 +-
 lib/iscsi/tgt_node.c                          |  10 +-
 lib/json/json_write.c                         |  43 ++-
 lib/jsonrpc/jsonrpc_client_tcp.c              |   5 +-
 lib/nbd/nbd.c                                 |   6 +-
 lib/nvme/nvme_ctrlr.c                         |  16 +-
 lib/nvme/nvme_ctrlr_cmd.c                     |   9 +-
 lib/nvme/nvme_cuse.c                          |   6 +-
 lib/nvme/nvme_ns.c                            |  15 +-
 lib/nvme/nvme_opal.c                          |   3 +-
 lib/nvme/nvme_pcie.c                          |   7 +-
 lib/nvme/nvme_pcie_common.c                   |   4 +-
 lib/nvme/nvme_rdma.c                          |  10 +-
 lib/nvme/nvme_tcp.c                           |  10 +-
 lib/nvme/nvme_transport.c                     |   6 +-
 lib/nvmf/ctrlr.c                              |   9 +-
 lib/nvmf/ctrlr_bdev.c                         |   7 +-
 lib/nvmf/fc.c                                 |   3 +-
 lib/nvmf/fc_ls.c                              |  18 +-
 lib/nvmf/nvmf.c                               |   9 +-
 lib/nvmf/nvmf_fc.h                            |   7 +-
 lib/nvmf/nvmf_rpc.c                           |   3 +-
 lib/nvmf/rdma.c                               |  28 +-
 lib/nvmf/subsystem.c                          |  19 +-
 lib/nvmf/tcp.c                                |   3 +-
 lib/nvmf/transport.c                          |   7 +-
 lib/nvmf/vfio_user.c                          |  17 +-
 lib/reduce/reduce.c                           |   3 +-
 lib/scsi/scsi_pr.c                            |   3 +-
 lib/sock/sock.c                               |   3 +-
 lib/vhost/vhost_blk.c                         |   4 +-
 lib/vhost/vhost_internal.h                    |   7 +-
 module/bdev/aio/bdev_aio.c                    |   9 +-
 module/bdev/crypto/vbdev_crypto.c             |   3 +-
 module/bdev/delay/vbdev_delay.c               |   3 +-
 module/bdev/gpt/vbdev_gpt.c                   |   3 +-
 module/bdev/iscsi/bdev_iscsi.c                |   6 +-
 module/bdev/malloc/bdev_malloc.c              |   9 +-
 module/bdev/nvme/bdev_nvme_rpc.c              |   3 +-
 module/bdev/ocf/ctx.c                         |  12 +-
 module/bdev/ocf/volume.h                      |   3 +-
 module/bdev/passthru/vbdev_passthru.c         |   3 +-
 module/bdev/raid/bdev_raid.c                  |  15 +-
 module/bdev/raid/bdev_raid.h                  |  13 +-
 module/bdev/raid/concat.c                     |   9 +-
 module/bdev/raid/raid0.c                      |   9 +-
 module/bdev/split/vbdev_split.c               |   3 +-
 module/bdev/uring/bdev_uring.c                |  14 +-
 module/bdev/virtio/bdev_virtio.h              |   3 +-
 module/bdev/virtio/bdev_virtio_scsi.c         |   6 +-
 module/event/subsystems/nvmf/nvmf_rpc.c       |   3 +-
 scripts/check_format.sh                       |   2 +-
 test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c |  51 ++-
 test/blobfs/fuse/fuse.c                       |   3 +-
 test/blobfs/mkfs/mkfs.c                       |   3 +-
 test/dma/test_dma/test_dma.c                  |  28 +-
 test/env/pci/pci_ut.c                         |   6 +-
 test/event/app_repeat/app_repeat.c            |   3 +-
 test/external_code/passthru/vbdev_passthru.c  |   3 +-
 test/nvme/aer/aer.c                           |   3 +-
 test/nvme/boot_partition/boot_partition.c     |   3 +-
 test/nvme/compliance/nvme_compliance.c        |   3 +-
 test/nvme/connect_stress/connect_stress.c     |   6 +-
 test/nvme/cuse/cuse.c                         |   3 +-
 .../deallocated_value/deallocated_value.c     |   3 +-
 test/nvme/e2edp/nvme_dp.c                     |  42 ++-
 test/nvme/err_injection/err_injection.c       |   3 +-
 test/nvme/fused_ordering/fused_ordering.c     |   3 +-
 test/nvme/overhead/overhead.c                 |   6 +-
 test/nvme/reserve/reserve.c                   |   3 +-
 test/nvme/reset/reset.c                       |   6 +-
 test/nvme/sgl/sgl.c                           |  45 ++-
 test/nvme/simple_copy/simple_copy.c           |   3 +-
 test/nvme/startup/startup.c                   |   3 +-
 test/rpc_client/rpc_client_test.c             |   3 +-
 test/unit/lib/accel/accel.c/accel_engine_ut.c |   3 +-
 test/unit/lib/bdev/compress.c/compress_ut.c   |  22 +-
 test/unit/lib/bdev/crypto.c/crypto_ut.c       |  14 +-
 .../lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c  |   5 +-
 .../lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c  |   9 +-
 .../lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c     |   3 +-
 .../vbdev_zone_block.c/vbdev_zone_block_ut.c  |   6 +-
 test/unit/lib/blob/blob.c/blob_ut.c           |   3 +-
 .../blobfs/blobfs_async_ut/blobfs_async_ut.c  |   3 +-
 .../lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c |   3 +-
 .../blobfs/blobfs_sync_ut/blobfs_sync_ut.c    |   3 +-
 test/unit/lib/blobfs/tree.c/tree_ut.c         |   3 +-
 .../lib/env_dpdk/pci_event.c/pci_event_ut.c   |   3 +-
 test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c |   3 +-
 test/unit/lib/ioat/ioat.c/ioat_ut.c           |   6 +-
 test/unit/lib/iscsi/conn.c/conn_ut.c          |   3 +-
 .../lib/json/json_parse.c/json_parse_ut.c     |   3 +-
 test/unit/lib/json/json_util.c/json_util_ut.c |   3 +-
 .../lib/json/json_write.c/json_write_ut.c     |   3 +-
 .../jsonrpc_server.c/jsonrpc_server_ut.c      |   3 +-
 test/unit/lib/log/log.c/log_ut.c              |   3 +-
 test/unit/lib/lvol/lvol.c/lvol_ut.c           |  28 +-
 test/unit/lib/nvme/nvme.c/nvme_ut.c           |   3 +-
 .../lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c     |  18 +-
 .../nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c | 114 ++++---
 .../nvme_ctrlr_ocssd_cmd_ut.c                 |   6 +-
 test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c |   3 +-
 .../lib/nvme/nvme_fabric.c/nvme_fabric_ut.c   |   3 +-
 .../lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c   |   3 +-
 test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c     |   3 +-
 .../lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c   |  12 +-
 .../nvme_ns_ocssd_cmd_ut.c                    |   3 +-
 test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c |   3 +-
 test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c |   6 +-
 .../nvme_pcie_common.c/nvme_pcie_common_ut.c  |  12 +-
 .../lib/nvme/nvme_qpair.c/nvme_qpair_ut.c     |  12 +-
 .../lib/nvme/nvme_quirks.c/nvme_quirks_ut.c   |   3 +-
 test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c |   9 +-
 test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c   |   3 +-
 .../nvme/nvme_transport.c/nvme_transport_ut.c |   3 +-
 test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c         |   3 +-
 .../lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c     |  17 +-
 .../ctrlr_discovery.c/ctrlr_discovery_ut.c    |   3 +-
 test/unit/lib/nvmf/fc.c/fc_ut.c               |   3 +-
 test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c         |   3 +-
 test/unit/lib/nvmf/nvmf.c/nvmf_ut.c           |   3 +-
 test/unit/lib/nvmf/rdma.c/rdma_ut.c           |  11 +-
 test/unit/lib/nvmf/subsystem.c/subsystem_ut.c |   3 +-
 test/unit/lib/nvmf/tcp.c/tcp_ut.c             |   3 +-
 test/unit/lib/nvmf/transport.c/transport_ut.c |   3 +-
 test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c |   3 +-
 test/unit/lib/reduce/reduce.c/reduce_ut.c     |   9 +-
 test/unit/lib/rpc/rpc.c/rpc_ut.c              |  13 +-
 test/unit/lib/scsi/lun.c/lun_ut.c             |   3 +-
 test/unit/lib/vhost/vhost.c/vhost_ut.c        |   5 +-
 172 files changed, 1186 insertions(+), 748 deletions(-)

diff --git a/app/iscsi_top/iscsi_top.c b/app/iscsi_top/iscsi_top.c
index fac216a6d..b78b309c6 100644
--- a/app/iscsi_top/iscsi_top.c
+++ b/app/iscsi_top/iscsi_top.c
@@ -19,7 +19,8 @@ static int g_shm_id = 0;
 
 struct spdk_jsonrpc_client *g_rpc_client;
 
-static void usage(void)
+static void
+usage(void)
 {
 	fprintf(stderr, "usage:\n");
 	fprintf(stderr, "   %s <option>\n", exe_name);
@@ -107,7 +108,8 @@ end:
 	spdk_jsonrpc_client_free_request(request);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	void			*history_ptr;
 	struct spdk_trace_histories *histories;
diff --git a/app/spdk_dd/spdk_dd.c b/app/spdk_dd/spdk_dd.c
index 7cd1309a4..0305f46c1 100644
--- a/app/spdk_dd/spdk_dd.c
+++ b/app/spdk_dd/spdk_dd.c
@@ -677,7 +677,8 @@ dd_open_bdev(struct dd_target *target, const char *bdev_name, uint64_t skip_bloc
 	return 0;
 }
 
-static void dd_finish(void)
+static void
+dd_finish(void)
 {
 	/* Interrupt operation */
 	g_interrupt = true;
diff --git a/app/spdk_top/spdk_top.c b/app/spdk_top/spdk_top.c
index 3f4e95d23..c46a52aa6 100644
--- a/app/spdk_top/spdk_top.c
+++ b/app/spdk_top/spdk_top.c
@@ -3239,7 +3239,8 @@ wait_init(pthread_t *data_thread)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int op, rc;
 	char *socket = SPDK_DEFAULT_RPC_ADDR;
diff --git a/app/trace/trace.cpp b/app/trace/trace.cpp
index 1b5e6f85c..0216b94e8 100644
--- a/app/trace/trace.cpp
+++ b/app/trace/trace.cpp
@@ -318,7 +318,8 @@ print_json(void *cb_ctx, const void *data, size_t size)
 	return 0;
 }
 
-static void usage(void)
+static void
+usage(void)
 {
 	fprintf(stderr, "usage:\n");
 	fprintf(stderr, "   %s <option> <lcore#>\n", g_exe_name);
@@ -335,7 +336,8 @@ static void usage(void)
 	fprintf(stderr, "                 '-j' to use JSON to format the output\n");
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct spdk_trace_parser_opts	opts;
 	struct spdk_trace_parser_entry	entry;
diff --git a/app/trace_record/trace_record.c b/app/trace_record/trace_record.c
index 0148deb09..2c2aeea80 100644
--- a/app/trace_record/trace_record.c
+++ b/app/trace_record/trace_record.c
@@ -538,7 +538,8 @@ setup_exit_signal_handler(void)
 	return rc;
 }
 
-static void usage(void)
+static void
+usage(void)
 {
 	printf("\n%s is used to record all SPDK generated trace entries\n", g_exe_name);
 	printf("from SPDK trace shared-memory to specified file.\n\n");
@@ -554,7 +555,8 @@ static void usage(void)
 	printf("                 '-h' to print usage information\n");
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	const char			*app_name = NULL;
 	const char			*file_name = NULL;
diff --git a/examples/bdev/fio_plugin/fio_plugin.c b/examples/bdev/fio_plugin/fio_plugin.c
index e177e86b3..ee53146fd 100644
--- a/examples/bdev/fio_plugin/fio_plugin.c
+++ b/examples/bdev/fio_plugin/fio_plugin.c
@@ -1115,8 +1115,9 @@ spdk_fio_reset_wp(struct thread_data *td, struct fio_file *f, uint64_t offset, u
 #endif
 
 #if FIO_IOOPS_VERSION >= 30
-static int spdk_fio_get_max_open_zones(struct thread_data *td, struct fio_file *f,
-				       unsigned int *max_open_zones)
+static int
+spdk_fio_get_max_open_zones(struct thread_data *td, struct fio_file *f,
+			    unsigned int *max_open_zones)
 {
 	struct spdk_bdev *bdev;
 
@@ -1294,7 +1295,8 @@ struct ioengine_ops ioengine = {
 	.options		= options,
 };
 
-static void fio_init spdk_fio_register(void)
+static void fio_init
+spdk_fio_register(void)
 {
 	register_ioengine(&ioengine);
 }
@@ -1312,7 +1314,8 @@ spdk_fio_finish_env(void)
 	spdk_env_fini();
 }
 
-static void fio_exit spdk_fio_unregister(void)
+static void fio_exit
+spdk_fio_unregister(void)
 {
 	if (g_spdk_env_initialized) {
 		spdk_fio_finish_env();
diff --git a/examples/bdev/hello_world/hello_bdev.c b/examples/bdev/hello_world/hello_bdev.c
index 065c5dfe7..ccf39cd58 100644
--- a/examples/bdev/hello_world/hello_bdev.c
+++ b/examples/bdev/hello_world/hello_bdev.c
@@ -39,7 +39,8 @@ hello_bdev_usage(void)
 /*
  * This function is called to parse the parameters that are specific to this application
  */
-static int hello_bdev_parse_arg(int ch, char *arg)
+static int
+hello_bdev_parse_arg(int ch, char *arg)
 {
 	switch (ch) {
 	case 'b':
diff --git a/examples/ioat/verify/verify.c b/examples/ioat/verify/verify.c
index f632aa467..33212f434 100644
--- a/examples/ioat/verify/verify.c
+++ b/examples/ioat/verify/verify.c
@@ -95,7 +95,8 @@ ioat_exit(void)
 		free(dev);
 	}
 }
-static void prepare_ioat_task(struct thread_entry *thread_entry, struct ioat_task *ioat_task)
+static void
+prepare_ioat_task(struct thread_entry *thread_entry, struct ioat_task *ioat_task)
 {
 	int len;
 	uintptr_t src_offset;
diff --git a/examples/nvme/abort/abort.c b/examples/nvme/abort/abort.c
index b64d9f1ba..9500ed362 100644
--- a/examples/nvme/abort/abort.c
+++ b/examples/nvme/abort/abort.c
@@ -1020,7 +1020,8 @@ associate_workers_with_ns(void)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc;
 	struct worker_thread *worker, *main_worker;
diff --git a/examples/nvme/cmb_copy/cmb_copy.c b/examples/nvme/cmb_copy/cmb_copy.c
index ab4d75d4d..51ea5617b 100644
--- a/examples/nvme/cmb_copy/cmb_copy.c
+++ b/examples/nvme/cmb_copy/cmb_copy.c
@@ -290,7 +290,8 @@ parse_args(int argc, char **argv)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc = 0;
 	struct spdk_env_opts opts;
diff --git a/examples/nvme/discovery_aer/discovery_aer.c b/examples/nvme/discovery_aer/discovery_aer.c
index 0dfa514a2..c41f4eb08 100644
--- a/examples/nvme/discovery_aer/discovery_aer.c
+++ b/examples/nvme/discovery_aer/discovery_aer.c
@@ -102,7 +102,8 @@ get_discovery_log_page(struct spdk_nvme_ctrlr *ctrlr)
 	}
 }
 
-static void usage(char *program_name)
+static void
+usage(char *program_name)
 {
 	printf("%s options", program_name);
 	printf("\n");
@@ -247,7 +248,8 @@ setup_sig_handlers(void)
 	}
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc;
 	struct spdk_env_opts opts;
diff --git a/examples/nvme/fio_plugin/fio_plugin.c b/examples/nvme/fio_plugin/fio_plugin.c
index bf8460e7e..69791c1bd 100644
--- a/examples/nvme/fio_plugin/fio_plugin.c
+++ b/examples/nvme/fio_plugin/fio_plugin.c
@@ -449,7 +449,8 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 	fio_file_set_size_known(f);
 }
 
-static void parse_prchk_flags(const char *prchk_str)
+static void
+parse_prchk_flags(const char *prchk_str)
 {
 	if (!prchk_str) {
 		return;
@@ -466,7 +467,8 @@ static void parse_prchk_flags(const char *prchk_str)
 	}
 }
 
-static void parse_pract_flag(int pract)
+static void
+parse_pract_flag(int pract)
 {
 	if (pract == 1) {
 		g_spdk_pract_flag = SPDK_NVME_IO_FLAGS_PRACT;
@@ -501,7 +503,8 @@ fio_redirected_to_dev_null(void)
  * 'key=value [key=value] ... ns=value'
  * For example, For local PCIe NVMe device  - 'trtype=PCIe traddr=0000.04.00.0 ns=1'
  * For remote exported by NVMe-oF target, 'trtype=RDMA adrfam=IPv4 traddr=192.168.100.8 trsvcid=4420 ns=1' */
-static int spdk_fio_setup(struct thread_data *td)
+static int
+spdk_fio_setup(struct thread_data *td)
 {
 	struct spdk_fio_thread *fio_thread;
 	struct spdk_fio_options *fio_options = td->eo;
@@ -676,7 +679,8 @@ static int spdk_fio_setup(struct thread_data *td)
 	return rc;
 }
 
-static int spdk_fio_open(struct thread_data *td, struct fio_file *f)
+static int
+spdk_fio_open(struct thread_data *td, struct fio_file *f)
 {
 	struct spdk_fio_qpair *fio_qpair = f->engine_data;
 	struct spdk_fio_ctrlr *fio_ctrlr = fio_qpair->fio_ctrlr;
@@ -706,7 +710,8 @@ static int spdk_fio_open(struct thread_data *td, struct fio_file *f)
 	return 0;
 }
 
-static int spdk_fio_close(struct thread_data *td, struct fio_file *f)
+static int
+spdk_fio_close(struct thread_data *td, struct fio_file *f)
 {
 	struct spdk_fio_qpair *fio_qpair = f->engine_data;
 
@@ -716,18 +721,21 @@ static int spdk_fio_close(struct thread_data *td, struct fio_file *f)
 	return 0;
 }
 
-static int spdk_fio_iomem_alloc(struct thread_data *td, size_t total_mem)
+static int
+spdk_fio_iomem_alloc(struct thread_data *td, size_t total_mem)
 {
 	td->orig_buffer = spdk_dma_zmalloc(total_mem, NVME_IO_ALIGN, NULL);
 	return td->orig_buffer == NULL;
 }
 
-static void spdk_fio_iomem_free(struct thread_data *td)
+static void
+spdk_fio_iomem_free(struct thread_data *td)
 {
 	spdk_dma_free(td->orig_buffer);
 }
 
-static int spdk_fio_io_u_init(struct thread_data *td, struct io_u *io_u)
+static int
+spdk_fio_io_u_init(struct thread_data *td, struct io_u *io_u)
 {
 	struct spdk_fio_thread	*fio_thread = td->io_ops_data;
 	struct spdk_fio_request	*fio_req;
@@ -754,7 +762,8 @@ static int spdk_fio_io_u_init(struct thread_data *td, struct io_u *io_u)
 	return 0;
 }
 
-static void spdk_fio_io_u_free(struct thread_data *td, struct io_u *io_u)
+static void
+spdk_fio_io_u_free(struct thread_data *td, struct io_u *io_u)
 {
 	struct spdk_fio_request *fio_req = io_u->engine_data;
 
@@ -923,7 +932,8 @@ fio_separate_md_verify_pi(struct spdk_fio_qpair *fio_qpair, struct io_u *io_u)
 	return rc;
 }
 
-static void spdk_fio_completion_cb(void *ctx, const struct spdk_nvme_cpl *cpl)
+static void
+spdk_fio_completion_cb(void *ctx, const struct spdk_nvme_cpl *cpl)
 {
 	struct spdk_fio_request		*fio_req = ctx;
 	struct spdk_fio_thread		*fio_thread = fio_req->fio_thread;
@@ -1102,7 +1112,8 @@ spdk_fio_queue(struct thread_data *td, struct io_u *io_u)
 	return FIO_Q_QUEUED;
 }
 
-static struct io_u *spdk_fio_event(struct thread_data *td, int event)
+static struct io_u *
+spdk_fio_event(struct thread_data *td, int event)
 {
 	struct spdk_fio_thread *fio_thread = td->io_ops_data;
 
@@ -1111,8 +1122,9 @@ static struct io_u *spdk_fio_event(struct thread_data *td, int event)
 	return fio_thread->iocq[event];
 }
 
-static int spdk_fio_getevents(struct thread_data *td, unsigned int min,
-			      unsigned int max, const struct timespec *t)
+static int
+spdk_fio_getevents(struct thread_data *td, unsigned int min,
+		   unsigned int max, const struct timespec *t)
 {
 	struct spdk_fio_thread *fio_thread = td->io_ops_data;
 	struct spdk_fio_qpair *fio_qpair = NULL;
@@ -1174,7 +1186,8 @@ static int spdk_fio_getevents(struct thread_data *td, unsigned int min,
 	return fio_thread->iocq_count;
 }
 
-static int spdk_fio_invalidate(struct thread_data *td, struct fio_file *f)
+static int
+spdk_fio_invalidate(struct thread_data *td, struct fio_file *f)
 {
 	/* TODO: This should probably send a flush to the device, but for now just return successful. */
 	return 0;
@@ -1387,8 +1400,9 @@ spdk_fio_reset_wp(struct thread_data *td, struct fio_file *f, uint64_t offset, u
 #endif
 
 #if FIO_IOOPS_VERSION >= 30
-static int spdk_fio_get_max_open_zones(struct thread_data *td, struct fio_file *f,
-				       unsigned int *max_open_zones)
+static int
+spdk_fio_get_max_open_zones(struct thread_data *td, struct fio_file *f,
+			    unsigned int *max_open_zones)
 {
 	struct spdk_fio_thread *fio_thread = td->io_ops_data;
 	struct spdk_fio_qpair *fio_qpair = NULL;
@@ -1405,7 +1419,8 @@ static int spdk_fio_get_max_open_zones(struct thread_data *td, struct fio_file *
 }
 #endif
 
-static void spdk_fio_cleanup(struct thread_data *td)
+static void
+spdk_fio_cleanup(struct thread_data *td)
 {
 	struct spdk_fio_thread	*fio_thread = td->io_ops_data;
 	struct spdk_fio_qpair	*fio_qpair, *fio_qpair_tmp;
@@ -1713,12 +1728,14 @@ struct ioengine_ops ioengine = {
 	.option_struct_size	= sizeof(struct spdk_fio_options),
 };
 
-static void fio_init fio_spdk_register(void)
+static void fio_init
+fio_spdk_register(void)
 {
 	register_ioengine(&ioengine);
 }
 
-static void fio_exit fio_spdk_unregister(void)
+static void fio_exit
+fio_spdk_unregister(void)
 {
 	if (g_spdk_env_initialized) {
 		spdk_env_fini();
diff --git a/examples/nvme/hello_world/hello_world.c b/examples/nvme/hello_world/hello_world.c
index e36fa47f4..1b458c990 100644
--- a/examples/nvme/hello_world/hello_world.c
+++ b/examples/nvme/hello_world/hello_world.c
@@ -439,7 +439,8 @@ parse_args(int argc, char **argv, struct spdk_env_opts *env_opts)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc;
 	struct spdk_env_opts opts;
diff --git a/examples/nvme/hotplug/hotplug.c b/examples/nvme/hotplug/hotplug.c
index 2c784beef..2b185be1e 100644
--- a/examples/nvme/hotplug/hotplug.c
+++ b/examples/nvme/hotplug/hotplug.c
@@ -49,12 +49,10 @@ static const char *g_iova_mode = NULL;
 static uint64_t g_timeout_in_us = SPDK_SEC_TO_USEC;
 static struct spdk_nvme_detach_ctx *g_detach_ctx;
 
-static void
-task_complete(struct perf_task *task);
+static void task_complete(struct perf_task *task);
 
-static void
-timeout_cb(void *cb_arg, struct spdk_nvme_ctrlr *ctrlr,
-	   struct spdk_nvme_qpair *qpair, uint16_t cid);
+static void timeout_cb(void *cb_arg, struct spdk_nvme_ctrlr *ctrlr,
+		       struct spdk_nvme_qpair *qpair, uint16_t cid);
 
 static void
 register_dev(struct spdk_nvme_ctrlr *ctrlr)
@@ -390,7 +388,8 @@ io_loop(void)
 	}
 }
 
-static void usage(char *program_name)
+static void
+usage(char *program_name)
 {
 	printf("%s options", program_name);
 	printf("\n");
@@ -499,7 +498,8 @@ register_controllers(void)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc;
 	struct spdk_env_opts opts;
diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c
index e803a18b5..736630a0d 100644
--- a/examples/nvme/identify/identify.c
+++ b/examples/nvme/identify/identify.c
@@ -2325,7 +2325,8 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 	spdk_nvme_detach_async(ctrlr, &g_detach_ctx);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int				rc;
 	struct spdk_env_opts		opts;
diff --git a/examples/nvme/nvme_manage/nvme_manage.c b/examples/nvme/nvme_manage/nvme_manage.c
index 20c038a7a..bc26ae26e 100644
--- a/examples/nvme/nvme_manage/nvme_manage.c
+++ b/examples/nvme/nvme_manage/nvme_manage.c
@@ -103,7 +103,8 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 	}
 }
 
-static void usage(void)
+static void
+usage(void)
 {
 	printf("NVMe Management Options");
 	printf("\n");
@@ -1583,7 +1584,8 @@ parse_args(int argc, char **argv)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int			rc;
 	struct spdk_env_opts	opts;
diff --git a/examples/nvme/perf/perf.c b/examples/nvme/perf/perf.c
index 40e679e18..9aacc9960 100644
--- a/examples/nvme/perf/perf.c
+++ b/examples/nvme/perf/perf.c
@@ -288,8 +288,7 @@ static TAILQ_HEAD(, trid_entry) g_trid_list = TAILQ_HEAD_INITIALIZER(g_trid_list
 
 static int g_file_optind; /* Index of first filename in argv */
 
-static inline void
-task_complete(struct perf_task *task);
+static inline void task_complete(struct perf_task *task);
 
 static void
 perf_set_sock_zcopy(const char *impl_name, bool enable)
@@ -1700,7 +1699,8 @@ work_fn(void *arg)
 	return 0;
 }
 
-static void usage(char *program_name)
+static void
+usage(char *program_name)
 {
 	printf("%s options", program_name);
 #if defined(SPDK_CONFIG_URING) || defined(HAVE_LIBAIO)
@@ -2820,7 +2820,8 @@ setup_sig_handlers(void)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc;
 	struct worker_thread *worker, *main_worker;
diff --git a/examples/nvme/pmr_persistence/pmr_persistence.c b/examples/nvme/pmr_persistence/pmr_persistence.c
index e979e9251..fdac1f238 100644
--- a/examples/nvme/pmr_persistence/pmr_persistence.c
+++ b/examples/nvme/pmr_persistence/pmr_persistence.c
@@ -328,7 +328,8 @@ cleanup(void)
 	}
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc = 0;
 	struct spdk_env_opts opts;
diff --git a/examples/nvme/reconnect/reconnect.c b/examples/nvme/reconnect/reconnect.c
index c0ab7d081..9f971d858 100644
--- a/examples/nvme/reconnect/reconnect.c
+++ b/examples/nvme/reconnect/reconnect.c
@@ -99,8 +99,7 @@ struct trid_entry {
 
 static TAILQ_HEAD(, trid_entry) g_trid_list = TAILQ_HEAD_INITIALIZER(g_trid_list);
 
-static inline void
-task_complete(struct perf_task *task);
+static inline void task_complete(struct perf_task *task);
 static void submit_io(struct ns_worker_ctx *ns_ctx, int queue_depth);
 
 static void io_complete(void *ctx, const struct spdk_nvme_cpl *cpl);
@@ -552,7 +551,8 @@ work_fn(void *arg)
 	return 0;
 }
 
-static void usage(char *program_name)
+static void
+usage(char *program_name)
 {
 	printf("%s options", program_name);
 	printf("\n");
@@ -1042,7 +1042,8 @@ nvme_poll_ctrlrs(void *arg)
 	return NULL;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc;
 	struct worker_thread *worker, *main_worker;
diff --git a/examples/nvmf/nvmf/nvmf.c b/examples/nvmf/nvmf/nvmf.c
index 9a205c879..559808eaa 100644
--- a/examples/nvmf/nvmf/nvmf.c
+++ b/examples/nvmf/nvmf/nvmf.c
@@ -836,7 +836,8 @@ nvmf_setup_signal_handlers(void)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc;
 	struct spdk_env_opts opts;
diff --git a/examples/sock/hello_world/hello_sock.c b/examples/sock/hello_world/hello_sock.c
index 199e308f8..8bb81a1cb 100644
--- a/examples/sock/hello_world/hello_sock.c
+++ b/examples/sock/hello_world/hello_sock.c
@@ -69,7 +69,8 @@ hello_sock_usage(void)
 /*
  * This function is called to parse the parameters that are specific to this application
  */
-static int hello_sock_parse_arg(int ch, char *arg)
+static int
+hello_sock_parse_arg(int ch, char *arg)
 {
 	switch (ch) {
 	case 'H':
diff --git a/examples/vmd/lsvmd/lsvmd.c b/examples/vmd/lsvmd/lsvmd.c
index 6d338bedf..0eb21cd17 100644
--- a/examples/vmd/lsvmd/lsvmd.c
+++ b/examples/vmd/lsvmd/lsvmd.c
@@ -55,7 +55,8 @@ print_device(void *ctx, struct spdk_pci_device *pci_device)
 	}
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct spdk_env_opts opts;
 	int rc;
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index 660138ffb..765d70d4d 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -165,8 +165,9 @@ struct vring {
 #define vring_used_event(vr) ((vr)->avail->ring[(vr)->num])
 #define vring_avail_event(vr) (*(__virtio16 *)&(vr)->used->ring[(vr)->num])
 
-static inline void vring_init(struct vring *vr, unsigned int num, void *p,
-			      unsigned long align)
+static inline void
+vring_init(struct vring *vr, unsigned int num, void *p,
+	   unsigned long align)
 {
 	vr->num = num;
 	vr->desc = p;
@@ -176,7 +177,8 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p,
 			     + align - 1) & ~(align - 1));
 }
 
-static inline unsigned vring_size(unsigned int num, unsigned long align)
+static inline unsigned
+vring_size(unsigned int num, unsigned long align)
 {
 	return ((sizeof(struct vring_desc) * num + sizeof(__virtio16) * (3 + num)
 		 + align - 1) & ~(align - 1))
@@ -187,7 +189,8 @@ static inline unsigned vring_size(unsigned int num, unsigned long align)
 /* Assuming a given event_idx value from the other side, if
  * we have just incremented index from old to new_idx,
  * should we trigger an event? */
-static inline int vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old)
+static inline int
+vring_need_event(__u16 event_idx, __u16 new_idx, __u16 old)
 {
 	/* Note: Xen has similar logic for notification hold-off
 	 * in include/xen/interface/io/ring.h with req_event and req_prod
diff --git a/include/spdk/nvmf_transport.h b/include/spdk/nvmf_transport.h
index 19e61d94b..8d706384c 100644
--- a/include/spdk/nvmf_transport.h
+++ b/include/spdk/nvmf_transport.h
@@ -463,8 +463,7 @@ spdk_nvmf_ctrlr_get_subsystem(struct spdk_nvmf_ctrlr *ctrlr);
  *
  * \return The NVMe-oF controller ID
  */
-uint16_t
-spdk_nvmf_ctrlr_get_id(struct spdk_nvmf_ctrlr *ctrlr);
+uint16_t spdk_nvmf_ctrlr_get_id(struct spdk_nvmf_ctrlr *ctrlr);
 
 static inline enum spdk_nvme_data_transfer
 spdk_nvmf_req_get_xfer(struct spdk_nvmf_request *req) {
diff --git a/include/spdk_internal/rdma.h b/include/spdk_internal/rdma.h
index 64a514126..17b4ecba2 100644
--- a/include/spdk_internal/rdma.h
+++ b/include/spdk_internal/rdma.h
@@ -250,8 +250,9 @@ int spdk_rdma_get_translation(struct spdk_rdma_mem_map *map, void *address,
  * \param translation Memory translation
  * \return Local Memory Key
  */
-static inline uint32_t spdk_rdma_memory_translation_get_lkey(struct spdk_rdma_memory_translation
-		*translation)
+static inline uint32_t
+spdk_rdma_memory_translation_get_lkey(struct spdk_rdma_memory_translation
+				      *translation)
 {
 	return translation->translation_type == SPDK_RDMA_TRANSLATION_MR ?
 	       translation->mr_or_key.mr->lkey : (uint32_t)translation->mr_or_key.key;
@@ -264,8 +265,9 @@ static inline uint32_t spdk_rdma_memory_translation_get_lkey(struct spdk_rdma_me
  * \param translation Memory translation
  * \return Remote Memory Key
  */
-static inline uint32_t spdk_rdma_memory_translation_get_rkey(struct spdk_rdma_memory_translation
-		*translation)
+static inline uint32_t
+spdk_rdma_memory_translation_get_rkey(struct spdk_rdma_memory_translation
+				      *translation)
 {
 	return translation->translation_type == SPDK_RDMA_TRANSLATION_MR ?
 	       translation->mr_or_key.mr->rkey : (uint32_t)translation->mr_or_key.key;
diff --git a/include/spdk_internal/virtio.h b/include/spdk_internal/virtio.h
index dc4a3ce7e..a1da4b54e 100644
--- a/include/spdk_internal/virtio.h
+++ b/include/spdk_internal/virtio.h
@@ -464,7 +464,6 @@ int virtio_pci_dev_init(struct virtio_dev *vdev, const char *name,
  * \return the name of the virtio device on success, NULL means it
  * is not a suitable uevent.
  */
-const char *
-virtio_pci_dev_event_process(int fd, uint16_t device_id);
+const char *virtio_pci_dev_event_process(int fd, uint16_t device_id);
 
 #endif /* SPDK_VIRTIO_H */
diff --git a/lib/accel/accel_engine.c b/lib/accel/accel_engine.c
index 11a4c3039..3482d1108 100644
--- a/lib/accel/accel_engine.c
+++ b/lib/accel/accel_engine.c
@@ -441,7 +441,8 @@ spdk_accel_submit_decompress(struct spdk_io_channel *ch, void *dst, void *src, u
 }
 
 /* Helper function when when accel modules register with the framework. */
-void spdk_accel_module_list_add(struct spdk_accel_module_if *accel_module)
+void
+spdk_accel_module_list_add(struct spdk_accel_module_if *accel_module)
 {
 	TAILQ_INSERT_TAIL(&spdk_accel_module_list, accel_module, tailq);
 	if (accel_module->get_ctx_size && accel_module->get_ctx_size() > g_max_accel_module_size) {
@@ -924,7 +925,8 @@ sw_accel_destroy_cb(void *io_device, void *ctx_buf)
 	spdk_poller_unregister(&sw_ch->completion_poller);
 }
 
-static struct spdk_io_channel *sw_accel_get_io_channel(void)
+static struct spdk_io_channel *
+sw_accel_get_io_channel(void)
 {
 	return spdk_get_io_channel(&sw_accel_engine);
 }
diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c
index cea5815a5..8f66ac3ab 100644
--- a/lib/bdev/bdev.c
+++ b/lib/bdev/bdev.c
@@ -331,27 +331,23 @@ static void bdev_write_zero_buffer_next(void *_bdev_io);
 static void bdev_enable_qos_msg(struct spdk_io_channel_iter *i);
 static void bdev_enable_qos_done(struct spdk_io_channel_iter *i, int status);
 
-static int
-bdev_readv_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
-			  struct iovec *iov, int iovcnt, void *md_buf, uint64_t offset_blocks,
-			  uint64_t num_blocks, spdk_bdev_io_completion_cb cb, void *cb_arg,
-			  struct spdk_bdev_ext_io_opts *opts, bool copy_opts);
-static int
-bdev_writev_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
-			   struct iovec *iov, int iovcnt, void *md_buf,
-			   uint64_t offset_blocks, uint64_t num_blocks,
-			   spdk_bdev_io_completion_cb cb, void *cb_arg,
-			   struct spdk_bdev_ext_io_opts *opts, bool copy_opts);
+static int bdev_readv_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
+				     struct iovec *iov, int iovcnt, void *md_buf, uint64_t offset_blocks,
+				     uint64_t num_blocks, spdk_bdev_io_completion_cb cb, void *cb_arg,
+				     struct spdk_bdev_ext_io_opts *opts, bool copy_opts);
+static int bdev_writev_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
+				      struct iovec *iov, int iovcnt, void *md_buf,
+				      uint64_t offset_blocks, uint64_t num_blocks,
+				      spdk_bdev_io_completion_cb cb, void *cb_arg,
+				      struct spdk_bdev_ext_io_opts *opts, bool copy_opts);
 
-static int
-bdev_lock_lba_range(struct spdk_bdev_desc *desc, struct spdk_io_channel *_ch,
-		    uint64_t offset, uint64_t length,
-		    lock_range_cb cb_fn, void *cb_arg);
+static int bdev_lock_lba_range(struct spdk_bdev_desc *desc, struct spdk_io_channel *_ch,
+			       uint64_t offset, uint64_t length,
+			       lock_range_cb cb_fn, void *cb_arg);
 
-static int
-bdev_unlock_lba_range(struct spdk_bdev_desc *desc, struct spdk_io_channel *_ch,
-		      uint64_t offset, uint64_t length,
-		      lock_range_cb cb_fn, void *cb_arg);
+static int bdev_unlock_lba_range(struct spdk_bdev_desc *desc, struct spdk_io_channel *_ch,
+				 uint64_t offset, uint64_t length,
+				 lock_range_cb cb_fn, void *cb_arg);
 
 static inline void bdev_io_complete(void *ctx);
 
@@ -481,8 +477,7 @@ struct spdk_bdev_wait_for_examine_ctx {
 	void				*cb_arg;
 };
 
-static bool
-bdev_module_all_actions_completed(void);
+static bool bdev_module_all_actions_completed(void);
 
 static int
 bdev_wait_for_examine_cb(void *arg)
@@ -2322,14 +2317,11 @@ _to_next_boundary(uint64_t offset, uint32_t boundary)
 	return (boundary - (offset % boundary));
 }
 
-static void
-bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg);
+static void bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg);
 
-static void
-_bdev_rw_split(void *_bdev_io);
+static void _bdev_rw_split(void *_bdev_io);
 
-static void
-bdev_unmap_split(struct spdk_bdev_io *bdev_io);
+static void bdev_unmap_split(struct spdk_bdev_io *bdev_io);
 
 static void
 _bdev_unmap_split(void *_bdev_io)
@@ -2337,8 +2329,7 @@ _bdev_unmap_split(void *_bdev_io)
 	return bdev_unmap_split((struct spdk_bdev_io *)_bdev_io);
 }
 
-static void
-bdev_write_zeroes_split(struct spdk_bdev_io *bdev_io);
+static void bdev_write_zeroes_split(struct spdk_bdev_io *bdev_io);
 
 static void
 _bdev_write_zeroes_split(void *_bdev_io)
@@ -2676,8 +2667,8 @@ bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)
 	}
 }
 
-static void
-bdev_rw_split_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io, bool success);
+static void bdev_rw_split_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
+				     bool success);
 
 static void
 bdev_io_split(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
@@ -2759,8 +2750,7 @@ _bdev_io_submit(void *ctx)
 	}
 }
 
-bool
-bdev_lba_range_overlapped(struct lba_range *range1, struct lba_range *range2);
+bool bdev_lba_range_overlapped(struct lba_range *range1, struct lba_range *range2);
 
 bool
 bdev_lba_range_overlapped(struct lba_range *range1, struct lba_range *range2)
@@ -3868,7 +3858,11 @@ _bdev_get_block_size_with_md(const struct spdk_bdev *bdev)
 	}
 }
 
-enum spdk_dif_type spdk_bdev_get_dif_type(const struct spdk_bdev *bdev)
+/* We have to use the typedef in the function declaration to appease astyle. */
+typedef enum spdk_dif_type spdk_dif_type_t;
+
+spdk_dif_type_t
+spdk_bdev_get_dif_type(const struct spdk_bdev *bdev)
 {
 	if (bdev->md_len != 0) {
 		return bdev->dif_type;
@@ -4220,10 +4214,11 @@ bdev_readv_blocks_with_md(struct spdk_bdev_desc *desc, struct spdk_io_channel *c
 	return 0;
 }
 
-int spdk_bdev_readv_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
-			   struct iovec *iov, int iovcnt,
-			   uint64_t offset_blocks, uint64_t num_blocks,
-			   spdk_bdev_io_completion_cb cb, void *cb_arg)
+int
+spdk_bdev_readv_blocks(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
+		       struct iovec *iov, int iovcnt,
+		       uint64_t offset_blocks, uint64_t num_blocks,
+		       spdk_bdev_io_completion_cb cb, void *cb_arg)
 {
 	return bdev_readv_blocks_with_md(desc, ch, iov, iovcnt, NULL, offset_blocks,
 					 num_blocks, cb, cb_arg, NULL, false);
@@ -7311,8 +7306,7 @@ bdev_lock_error_cleanup_cb(struct spdk_io_channel_iter *i, int status)
 	free(ctx);
 }
 
-static void
-bdev_unlock_lba_range_get_channel(struct spdk_io_channel_iter *i);
+static void bdev_unlock_lba_range_get_channel(struct spdk_io_channel_iter *i);
 
 static void
 bdev_lock_lba_range_cb(struct spdk_io_channel_iter *i, int status)
diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c
index 6b2aa4da0..324ac69d0 100644
--- a/lib/blob/blobstore.c
+++ b/lib/blob/blobstore.c
@@ -2218,9 +2218,8 @@ blob_persist_dirty_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
 	blob_persist_start(ctx);
 }
 
-static void
-bs_write_super(spdk_bs_sequence_t *seq, struct spdk_blob_store *bs,
-	       struct spdk_bs_super_block *super, spdk_bs_sequence_cpl cb_fn, void *cb_arg);
+static void bs_write_super(spdk_bs_sequence_t *seq, struct spdk_blob_store *bs,
+			   struct spdk_bs_super_block *super, spdk_bs_sequence_cpl cb_fn, void *cb_arg);
 
 
 static void
@@ -4070,7 +4069,8 @@ bs_load_replay_md_parse_page(struct spdk_bs_load_ctx *ctx, struct spdk_blob_md_p
 	return 0;
 }
 
-static bool bs_load_cur_extent_page_valid(struct spdk_blob_md_page *page)
+static bool
+bs_load_cur_extent_page_valid(struct spdk_blob_md_page *page)
 {
 	uint32_t crc;
 	struct spdk_blob_md_descriptor *desc = (struct spdk_blob_md_descriptor *)page->descriptors;
@@ -4108,7 +4108,8 @@ static bool bs_load_cur_extent_page_valid(struct spdk_blob_md_page *page)
 	return true;
 }
 
-static bool bs_load_cur_md_page_valid(struct spdk_bs_load_ctx *ctx)
+static bool
+bs_load_cur_md_page_valid(struct spdk_bs_load_ctx *ctx)
 {
 	uint32_t crc;
 	struct spdk_blob_md_page *page = ctx->page;
@@ -4128,8 +4129,7 @@ static bool bs_load_cur_md_page_valid(struct spdk_bs_load_ctx *ctx)
 	return true;
 }
 
-static void
-bs_load_replay_cur_md_page(struct spdk_bs_load_ctx *ctx);
+static void bs_load_replay_cur_md_page(struct spdk_bs_load_ctx *ctx);
 
 static void
 bs_load_write_used_clusters_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
@@ -5540,28 +5540,32 @@ bs_unregister_md_thread(struct spdk_blob_store *bs)
 	return 0;
 }
 
-spdk_blob_id spdk_blob_get_id(struct spdk_blob *blob)
+spdk_blob_id
+spdk_blob_get_id(struct spdk_blob *blob)
 {
 	assert(blob != NULL);
 
 	return blob->id;
 }
 
-uint64_t spdk_blob_get_num_pages(struct spdk_blob *blob)
+uint64_t
+spdk_blob_get_num_pages(struct spdk_blob *blob)
 {
 	assert(blob != NULL);
 
 	return bs_cluster_to_page(blob->bs, blob->active.num_clusters);
 }
 
-uint64_t spdk_blob_get_num_io_units(struct spdk_blob *blob)
+uint64_t
+spdk_blob_get_num_io_units(struct spdk_blob *blob)
 {
 	assert(blob != NULL);
 
 	return spdk_blob_get_num_pages(blob) * bs_io_unit_per_page(blob->bs);
 }
 
-uint64_t spdk_blob_get_num_clusters(struct spdk_blob *blob)
+uint64_t
+spdk_blob_get_num_clusters(struct spdk_blob *blob)
 {
 	assert(blob != NULL);
 
@@ -5742,14 +5746,16 @@ bs_create_blob(struct spdk_blob_store *bs,
 	blob_persist(seq, blob, bs_create_blob_cpl, blob);
 }
 
-void spdk_bs_create_blob(struct spdk_blob_store *bs,
-			 spdk_blob_op_with_id_complete cb_fn, void *cb_arg)
+void
+spdk_bs_create_blob(struct spdk_blob_store *bs,
+		    spdk_blob_op_with_id_complete cb_fn, void *cb_arg)
 {
 	bs_create_blob(bs, NULL, NULL, cb_fn, cb_arg);
 }
 
-void spdk_bs_create_blob_ext(struct spdk_blob_store *bs, const struct spdk_blob_opts *opts,
-			     spdk_blob_op_with_id_complete cb_fn, void *cb_arg)
+void
+spdk_bs_create_blob_ext(struct spdk_blob_store *bs, const struct spdk_blob_opts *opts,
+			spdk_blob_op_with_id_complete cb_fn, void *cb_arg)
 {
 	bs_create_blob(bs, opts, NULL, cb_fn, cb_arg);
 }
@@ -6132,9 +6138,10 @@ bs_snapshot_origblob_open_cpl(void *cb_arg, struct spdk_blob *_blob, int bserrno
 		       bs_snapshot_newblob_create_cpl, ctx);
 }
 
-void spdk_bs_create_snapshot(struct spdk_blob_store *bs, spdk_blob_id blobid,
-			     const struct spdk_blob_xattr_opts *snapshot_xattrs,
-			     spdk_blob_op_with_id_complete cb_fn, void *cb_arg)
+void
+spdk_bs_create_snapshot(struct spdk_blob_store *bs, spdk_blob_id blobid,
+			const struct spdk_blob_xattr_opts *snapshot_xattrs,
+			spdk_blob_op_with_id_complete cb_fn, void *cb_arg)
 {
 	struct spdk_clone_snapshot_ctx *ctx = calloc(1, sizeof(*ctx));
 
@@ -6241,9 +6248,10 @@ bs_clone_origblob_open_cpl(void *cb_arg, struct spdk_blob *_blob, int bserrno)
 		       bs_clone_newblob_create_cpl, ctx);
 }
 
-void spdk_bs_create_clone(struct spdk_blob_store *bs, spdk_blob_id blobid,
-			  const struct spdk_blob_xattr_opts *clone_xattrs,
-			  spdk_blob_op_with_id_complete cb_fn, void *cb_arg)
+void
+spdk_bs_create_clone(struct spdk_blob_store *bs, spdk_blob_id blobid,
+		     const struct spdk_blob_xattr_opts *clone_xattrs,
+		     spdk_blob_op_with_id_complete cb_fn, void *cb_arg)
 {
 	struct spdk_clone_snapshot_ctx	*ctx = calloc(1, sizeof(*ctx));
 
@@ -7249,14 +7257,16 @@ bs_open_blob(struct spdk_blob_store *bs,
 	blob_load(seq, blob, bs_open_blob_cpl, blob);
 }
 
-void spdk_bs_open_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,
-		       spdk_blob_op_with_handle_complete cb_fn, void *cb_arg)
+void
+spdk_bs_open_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,
+		  spdk_blob_op_with_handle_complete cb_fn, void *cb_arg)
 {
 	bs_open_blob(bs, blobid, NULL, cb_fn, cb_arg);
 }
 
-void spdk_bs_open_blob_ext(struct spdk_blob_store *bs, spdk_blob_id blobid,
-			   struct spdk_blob_open_opts *opts, spdk_blob_op_with_handle_complete cb_fn, void *cb_arg)
+void
+spdk_bs_open_blob_ext(struct spdk_blob_store *bs, spdk_blob_id blobid,
+		      struct spdk_blob_open_opts *opts, spdk_blob_op_with_handle_complete cb_fn, void *cb_arg)
 {
 	bs_open_blob(bs, blobid, opts, cb_fn, cb_arg);
 }
@@ -7264,7 +7274,8 @@ void spdk_bs_open_blob_ext(struct spdk_blob_store *bs, spdk_blob_id blobid,
 /* END spdk_bs_open_blob */
 
 /* START spdk_blob_set_read_only */
-int spdk_blob_set_read_only(struct spdk_blob *blob)
+int
+spdk_blob_set_read_only(struct spdk_blob *blob)
 {
 	blob_verify_md_op(blob);
 
@@ -7503,7 +7514,8 @@ blob_close_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
 	bs_sequence_finish(seq, bserrno);
 }
 
-void spdk_blob_close(struct spdk_blob *blob, spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_blob_close(struct spdk_blob *blob, spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	struct spdk_bs_cpl	cpl;
 	spdk_bs_sequence_t	*seq;
@@ -7538,51 +7550,58 @@ struct spdk_io_channel *spdk_bs_alloc_io_channel(struct spdk_blob_store *bs)
 	return spdk_get_io_channel(bs);
 }
 
-void spdk_bs_free_io_channel(struct spdk_io_channel *channel)
+void
+spdk_bs_free_io_channel(struct spdk_io_channel *channel)
 {
 	spdk_put_io_channel(channel);
 }
 
-void spdk_blob_io_unmap(struct spdk_blob *blob, struct spdk_io_channel *channel,
-			uint64_t offset, uint64_t length, spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_blob_io_unmap(struct spdk_blob *blob, struct spdk_io_channel *channel,
+		   uint64_t offset, uint64_t length, spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	blob_request_submit_op(blob, channel, NULL, offset, length, cb_fn, cb_arg,
 			       SPDK_BLOB_UNMAP);
 }
 
-void spdk_blob_io_write_zeroes(struct spdk_blob *blob, struct spdk_io_channel *channel,
-			       uint64_t offset, uint64_t length, spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_blob_io_write_zeroes(struct spdk_blob *blob, struct spdk_io_channel *channel,
+			  uint64_t offset, uint64_t length, spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	blob_request_submit_op(blob, channel, NULL, offset, length, cb_fn, cb_arg,
 			       SPDK_BLOB_WRITE_ZEROES);
 }
 
-void spdk_blob_io_write(struct spdk_blob *blob, struct spdk_io_channel *channel,
-			void *payload, uint64_t offset, uint64_t length,
-			spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_blob_io_write(struct spdk_blob *blob, struct spdk_io_channel *channel,
+		   void *payload, uint64_t offset, uint64_t length,
+		   spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	blob_request_submit_op(blob, channel, payload, offset, length, cb_fn, cb_arg,
 			       SPDK_BLOB_WRITE);
 }
 
-void spdk_blob_io_read(struct spdk_blob *blob, struct spdk_io_channel *channel,
-		       void *payload, uint64_t offset, uint64_t length,
-		       spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_blob_io_read(struct spdk_blob *blob, struct spdk_io_channel *channel,
+		  void *payload, uint64_t offset, uint64_t length,
+		  spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	blob_request_submit_op(blob, channel, payload, offset, length, cb_fn, cb_arg,
 			       SPDK_BLOB_READ);
 }
 
-void spdk_blob_io_writev(struct spdk_blob *blob, struct spdk_io_channel *channel,
-			 struct iovec *iov, int iovcnt, uint64_t offset, uint64_t length,
-			 spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_blob_io_writev(struct spdk_blob *blob, struct spdk_io_channel *channel,
+		    struct iovec *iov, int iovcnt, uint64_t offset, uint64_t length,
+		    spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	blob_request_submit_rw_iov(blob, channel, iov, iovcnt, offset, length, cb_fn, cb_arg, false, NULL);
 }
 
-void spdk_blob_io_readv(struct spdk_blob *blob, struct spdk_io_channel *channel,
-			struct iovec *iov, int iovcnt, uint64_t offset, uint64_t length,
-			spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_blob_io_readv(struct spdk_blob *blob, struct spdk_io_channel *channel,
+		   struct iovec *iov, int iovcnt, uint64_t offset, uint64_t length,
+		   spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	blob_request_submit_rw_iov(blob, channel, iov, iovcnt, offset, length, cb_fn, cb_arg, true, NULL);
 }
diff --git a/lib/dma/dma.c b/lib/dma/dma.c
index 5f78963d1..d63f6671e 100644
--- a/lib/dma/dma.c
+++ b/lib/dma/dma.c
@@ -130,7 +130,11 @@ spdk_memory_domain_get_context(struct spdk_memory_domain *domain)
 	return domain->ctx;
 }
 
-enum spdk_dma_device_type spdk_memory_domain_get_dma_device_type(struct spdk_memory_domain *domain)
+/* We have to use the typedef in the function declaration to appease astyle. */
+typedef enum spdk_dma_device_type spdk_dma_device_type_t;
+
+spdk_dma_device_type_t
+spdk_memory_domain_get_dma_device_type(struct spdk_memory_domain *domain)
 {
 	assert(domain);
 
diff --git a/lib/env_dpdk/env.c b/lib/env_dpdk/env.c
index 3e0f6d62a..5f0bd43bc 100644
--- a/lib/env_dpdk/env.c
+++ b/lib/env_dpdk/env.c
@@ -295,22 +295,26 @@ spdk_process_is_primary(void)
 	return (rte_eal_process_type() == RTE_PROC_PRIMARY);
 }
 
-uint64_t spdk_get_ticks(void)
+uint64_t
+spdk_get_ticks(void)
 {
 	return rte_get_timer_cycles();
 }
 
-uint64_t spdk_get_ticks_hz(void)
+uint64_t
+spdk_get_ticks_hz(void)
 {
 	return rte_get_timer_hz();
 }
 
-void spdk_delay_us(unsigned int us)
+void
+spdk_delay_us(unsigned int us)
 {
 	rte_delay_us(us);
 }
 
-void spdk_pause(void)
+void
+spdk_pause(void)
 {
 	rte_pause();
 }
diff --git a/lib/env_ocf/mpool.c b/lib/env_ocf/mpool.c
index f89361278..fa882b2d8 100644
--- a/lib/env_ocf/mpool.c
+++ b/lib/env_ocf/mpool.c
@@ -68,7 +68,8 @@ err:
 	return NULL;
 }
 
-void env_mpool_destroy(struct env_mpool *mpool)
+void
+env_mpool_destroy(struct env_mpool *mpool)
 {
 	if (mpool) {
 		int i;
@@ -83,8 +84,9 @@ void env_mpool_destroy(struct env_mpool *mpool)
 	}
 }
 
-static env_allocator *env_mpool_get_allocator(struct env_mpool *mpool,
-		uint32_t count)
+static env_allocator *
+env_mpool_get_allocator(struct env_mpool *mpool,
+			uint32_t count)
 {
 	unsigned int idx;
 
@@ -105,7 +107,8 @@ static env_allocator *env_mpool_get_allocator(struct env_mpool *mpool,
 	return mpool->allocator[idx];
 }
 
-void *env_mpool_new(struct env_mpool *mpool, uint32_t count)
+void *
+env_mpool_new(struct env_mpool *mpool, uint32_t count)
 {
 	void *items = NULL;
 	env_allocator *allocator;
@@ -122,8 +125,9 @@ void *env_mpool_new(struct env_mpool *mpool, uint32_t count)
 	return items;
 }
 
-bool env_mpool_del(struct env_mpool *mpool,
-		   void *items, uint32_t count)
+bool
+env_mpool_del(struct env_mpool *mpool,
+	      void *items, uint32_t count)
 {
 	env_allocator *allocator;
 
diff --git a/lib/env_ocf/ocf_env.c b/lib/env_ocf/ocf_env.c
index e32c1e6e5..376efac9f 100644
--- a/lib/env_ocf/ocf_env.c
+++ b/lib/env_ocf/ocf_env.c
@@ -114,7 +114,8 @@ env_crc32(uint32_t crc, uint8_t const *message, size_t len)
 /* EXECUTION CONTEXTS */
 pthread_mutex_t *exec_context_mutex;
 
-static void __attribute__((constructor)) init_execution_context(void)
+static void
+__attribute__((constructor)) init_execution_context(void)
 {
 	unsigned count = env_get_execution_context_count();
 	unsigned i;
@@ -127,7 +128,8 @@ static void __attribute__((constructor)) init_execution_context(void)
 	}
 }
 
-static void __attribute__((destructor)) deinit_execution_context(void)
+static void
+__attribute__((destructor)) deinit_execution_context(void)
 {
 	unsigned count = env_get_execution_context_count();
 	unsigned i;
@@ -146,7 +148,8 @@ static void __attribute__((destructor)) deinit_execution_context(void)
  * we simulate this behavior by acquiring per execution context mutex. As a
  * result the caller might actually get preempted, but no other thread will
  * execute in this context by the time the caller puts current execution ctx. */
-unsigned env_get_execution_context(void)
+unsigned
+env_get_execution_context(void)
 {
 	unsigned cpu;
 
@@ -158,12 +161,14 @@ unsigned env_get_execution_context(void)
 	return cpu;
 }
 
-void env_put_execution_context(unsigned ctx)
+void
+env_put_execution_context(unsigned ctx)
 {
 	pthread_mutex_unlock(&exec_context_mutex[ctx]);
 }
 
-unsigned env_get_execution_context_count(void)
+unsigned
+env_get_execution_context_count(void)
 {
 	int num = sysconf(_SC_NPROCESSORS_ONLN);
 
diff --git a/lib/env_ocf/ocf_env.h b/lib/env_ocf/ocf_env.h
index 25dee532e..356a0ad7e 100644
--- a/lib/env_ocf/ocf_env.h
+++ b/lib/env_ocf/ocf_env.h
@@ -91,30 +91,35 @@ typedef uint64_t sector_t;
 
 #define container_of(ptr, type, member) SPDK_CONTAINEROF(ptr, type, member)
 
-static inline void *env_malloc(size_t size, int flags)
+static inline void *
+env_malloc(size_t size, int flags)
 {
 	return spdk_malloc(size, 0, NULL, SPDK_ENV_LCORE_ID_ANY,
 			   SPDK_MALLOC_DMA);
 }
 
-static inline void *env_zalloc(size_t size, int flags)
+static inline void *
+env_zalloc(size_t size, int flags)
 {
 	return spdk_zmalloc(size, 0, NULL, SPDK_ENV_LCORE_ID_ANY,
 			    SPDK_MALLOC_DMA);
 }
 
-static inline void env_free(const void *ptr)
+static inline void
+env_free(const void *ptr)
 {
 	return spdk_free((void *)ptr);
 }
 
-static inline void *env_vmalloc(size_t size)
+static inline void *
+env_vmalloc(size_t size)
 {
 	return spdk_malloc(size, 0, NULL, SPDK_ENV_LCORE_ID_ANY,
 			   SPDK_MALLOC_DMA);
 }
 
-static inline void *env_vzalloc(size_t size)
+static inline void *
+env_vzalloc(size_t size)
 {
 	/* TODO: raw_ram init can request huge amount of memory to store
 	 * hashtable in it. need to ensure that allocation succeeds */
@@ -122,28 +127,33 @@ static inline void *env_vzalloc(size_t size)
 			    SPDK_MALLOC_DMA);
 }
 
-static inline void *env_vzalloc_flags(size_t size, int flags)
+static inline void *
+env_vzalloc_flags(size_t size, int flags)
 {
 	return env_vzalloc(size);
 }
 
-static inline void *env_secure_alloc(size_t size)
+static inline void *
+env_secure_alloc(size_t size)
 {
 	return spdk_zmalloc(size, 0, NULL, SPDK_ENV_LCORE_ID_ANY,
 			    SPDK_MALLOC_DMA);
 }
 
-static inline void env_secure_free(const void *ptr, size_t size)
+static inline void
+env_secure_free(const void *ptr, size_t size)
 {
 	return spdk_free((void *)ptr);
 }
 
-static inline void env_vfree(const void *ptr)
+static inline void
+env_vfree(const void *ptr)
 {
 	return spdk_free((void *)ptr);
 }
 
-static inline uint64_t env_get_free_memory(void)
+static inline uint64_t
+env_get_free_memory(void)
 {
 	return -1;
 }
@@ -177,33 +187,39 @@ typedef struct {
 	pthread_mutex_t m;
 } env_mutex;
 
-static inline int env_mutex_init(env_mutex *mutex)
+static inline int
+env_mutex_init(env_mutex *mutex)
 {
 	return !!pthread_mutex_init(&mutex->m, NULL);
 }
 
-static inline void env_mutex_lock(env_mutex *mutex)
+static inline void
+env_mutex_lock(env_mutex *mutex)
 {
 	ENV_BUG_ON(pthread_mutex_lock(&mutex->m));
 }
 
-static inline int env_mutex_lock_interruptible(env_mutex *mutex)
+static inline int
+env_mutex_lock_interruptible(env_mutex *mutex)
 {
 	env_mutex_lock(mutex);
 	return 0;
 }
 
-static inline int env_mutex_trylock(env_mutex *mutex)
+static inline int
+env_mutex_trylock(env_mutex *mutex)
 {
 	return pthread_mutex_trylock(&mutex->m) ? -OCF_ERR_NO_LOCK : 0;
 }
 
-static inline void env_mutex_unlock(env_mutex *mutex)
+static inline void
+env_mutex_unlock(env_mutex *mutex)
 {
 	ENV_BUG_ON(pthread_mutex_unlock(&mutex->m));
 }
 
-static inline int env_mutex_is_locked(env_mutex *mutex)
+static inline int
+env_mutex_is_locked(env_mutex *mutex)
 {
 	if (env_mutex_trylock(mutex) == 0) {
 		env_mutex_unlock(mutex);
@@ -213,7 +229,8 @@ static inline int env_mutex_is_locked(env_mutex *mutex)
 	return 1;
 }
 
-static inline int env_mutex_destroy(env_mutex *mutex)
+static inline int
+env_mutex_destroy(env_mutex *mutex)
 {
 	if (pthread_mutex_destroy(&mutex->m)) {
 		return 1;
@@ -226,7 +243,8 @@ static inline int env_mutex_destroy(env_mutex *mutex)
 
 typedef env_mutex env_rmutex;
 
-static inline int env_rmutex_init(env_rmutex *rmutex)
+static inline int
+env_rmutex_init(env_rmutex *rmutex)
 {
 	pthread_mutexattr_t attr;
 
@@ -237,32 +255,38 @@ static inline int env_rmutex_init(env_rmutex *rmutex)
 	return 0;
 }
 
-static inline void env_rmutex_lock(env_rmutex *rmutex)
+static inline void
+env_rmutex_lock(env_rmutex *rmutex)
 {
 	env_mutex_lock(rmutex);
 }
 
-static inline int env_rmutex_lock_interruptible(env_rmutex *rmutex)
+static inline int
+env_rmutex_lock_interruptible(env_rmutex *rmutex)
 {
 	return env_mutex_lock_interruptible(rmutex);
 }
 
-static inline int env_rmutex_trylock(env_rmutex *rmutex)
+static inline int
+env_rmutex_trylock(env_rmutex *rmutex)
 {
 	return env_mutex_trylock(rmutex);
 }
 
-static inline void env_rmutex_unlock(env_rmutex *rmutex)
+static inline void
+env_rmutex_unlock(env_rmutex *rmutex)
 {
 	env_mutex_unlock(rmutex);
 }
 
-static inline int env_rmutex_is_locked(env_rmutex *rmutex)
+static inline int
+env_rmutex_is_locked(env_rmutex *rmutex)
 {
 	return env_mutex_is_locked(rmutex);
 }
 
-static inline int env_rmutex_destroy(env_rmutex *rmutex)
+static inline int
+env_rmutex_destroy(env_rmutex *rmutex)
 {
 	return env_mutex_destroy(rmutex);
 }
@@ -272,42 +296,50 @@ typedef struct {
 	pthread_rwlock_t lock;
 } env_rwsem;
 
-static inline int env_rwsem_init(env_rwsem *s)
+static inline int
+env_rwsem_init(env_rwsem *s)
 {
 	return !!pthread_rwlock_init(&s->lock, NULL);
 }
 
-static inline void env_rwsem_up_read(env_rwsem *s)
+static inline void
+env_rwsem_up_read(env_rwsem *s)
 {
 	ENV_BUG_ON(pthread_rwlock_unlock(&s->lock));
 }
 
-static inline void env_rwsem_down_read(env_rwsem *s)
+static inline void
+env_rwsem_down_read(env_rwsem *s)
 {
 	ENV_BUG_ON(pthread_rwlock_rdlock(&s->lock));
 }
 
-static inline int env_rwsem_down_read_trylock(env_rwsem *s)
+static inline int
+env_rwsem_down_read_trylock(env_rwsem *s)
 {
 	return pthread_rwlock_tryrdlock(&s->lock) ? -OCF_ERR_NO_LOCK : 0;
 }
 
-static inline void env_rwsem_up_write(env_rwsem *s)
+static inline void
+env_rwsem_up_write(env_rwsem *s)
 {
 	ENV_BUG_ON(pthread_rwlock_unlock(&s->lock));
 }
 
-static inline void env_rwsem_down_write(env_rwsem *s)
+static inline void
+env_rwsem_down_write(env_rwsem *s)
 {
 	ENV_BUG_ON(pthread_rwlock_wrlock(&s->lock));
 }
 
-static inline int env_rwsem_down_write_trylock(env_rwsem *s)
+static inline int
+env_rwsem_down_write_trylock(env_rwsem *s)
 {
 	return pthread_rwlock_trywrlock(&s->lock) ? -OCF_ERR_NO_LOCK : 0;
 }
 
-static inline int env_rwsem_is_locked(env_rwsem *s)
+static inline int
+env_rwsem_is_locked(env_rwsem *s)
 {
 	if (env_rwsem_down_read_trylock(s) == 0) {
 		env_rwsem_up_read(s);
@@ -317,16 +349,19 @@ static inline int env_rwsem_is_locked(env_rwsem *s)
 	return 1;
 }
 
-static inline int env_rwsem_down_read_interruptible(env_rwsem *s)
+static inline int
+env_rwsem_down_read_interruptible(env_rwsem *s)
 {
 	return pthread_rwlock_rdlock(&s->lock);
 }
-static inline int env_rwsem_down_write_interruptible(env_rwsem *s)
+static inline int
+env_rwsem_down_write_interruptible(env_rwsem *s)
 {
 	return pthread_rwlock_wrlock(&s->lock);
 }
 
-static inline int env_rwsem_destroy(env_rwsem *s)
+static inline int
+env_rwsem_destroy(env_rwsem *s)
 {
 	return pthread_rwlock_destroy(&s->lock);
 }
@@ -352,77 +387,92 @@ typedef long env_atomic64;
 
 #define atomic_cmpxchg         __sync_val_compare_and_swap
 
-static inline int env_atomic_read(const env_atomic *a)
+static inline int
+env_atomic_read(const env_atomic *a)
 {
 	return atomic_read(a);
 }
 
-static inline void env_atomic_set(env_atomic *a, int i)
+static inline void
+env_atomic_set(env_atomic *a, int i)
 {
 	atomic_set(a, i);
 }
 
-static inline void env_atomic_add(int i, env_atomic *a)
+static inline void
+env_atomic_add(int i, env_atomic *a)
 {
 	atomic_add(a, i);
 }
 
-static inline void env_atomic_sub(int i, env_atomic *a)
+static inline void
+env_atomic_sub(int i, env_atomic *a)
 {
 	atomic_sub(a, i);
 }
 
-static inline bool env_atomic_sub_and_test(int i, env_atomic *a)
+static inline bool
+env_atomic_sub_and_test(int i, env_atomic *a)
 {
 	return __sync_sub_and_fetch(a, i) == 0;
 }
 
-static inline void env_atomic_inc(env_atomic *a)
+static inline void
+env_atomic_inc(env_atomic *a)
 {
 	atomic_inc(a);
 }
 
-static inline void env_atomic_dec(env_atomic *a)
+static inline void
+env_atomic_dec(env_atomic *a)
 {
 	atomic_dec(a);
 }
 
-static inline bool env_atomic_dec_and_test(env_atomic *a)
+static inline bool
+env_atomic_dec_and_test(env_atomic *a)
 {
 	return __sync_sub_and_fetch(a, 1) == 0;
 }
 
-static inline bool env_atomic_inc_and_test(env_atomic *a)
+static inline bool
+env_atomic_inc_and_test(env_atomic *a)
 {
 	return __sync_add_and_fetch(a, 1) == 0;
 }
 
-static inline int env_atomic_add_return(int i, env_atomic *a)
+static inline int
+env_atomic_add_return(int i, env_atomic *a)
 {
 	return __sync_add_and_fetch(a, i);
 }
 
-static inline int env_atomic_sub_return(int i, env_atomic *a)
+static inline int
+env_atomic_sub_return(int i, env_atomic *a)
 {
 	return __sync_sub_and_fetch(a, i);
 }
 
-static inline int env_atomic_inc_return(env_atomic *a)
+static inline int
+env_atomic_inc_return(env_atomic *a)
 {
 	return env_atomic_add_return(1, a);
 }
 
-static inline int env_atomic_dec_return(env_atomic *a)
+static inline int
+env_atomic_dec_return(env_atomic *a)
 {
 	return env_atomic_sub_return(1, a);
 }
 
-static inline int env_atomic_cmpxchg(env_atomic *a, int old, int new_value)
+static inline int
+env_atomic_cmpxchg(env_atomic *a, int old, int new_value)
 {
 	return atomic_cmpxchg(a, old, new_value);
 }
 
-static inline int env_atomic_add_unless(env_atomic *a, int i, int u)
+static inline int
+env_atomic_add_unless(env_atomic *a, int i, int u)
 {
 	int c, old;
 	c = env_atomic_read(a);
@@ -439,57 +489,68 @@ static inline int env_atomic_add_unless(env_atomic *a, int i, int u)
 	return c != (u);
 }
 
-static inline long env_atomic64_read(const env_atomic64 *a)
+static inline long
+env_atomic64_read(const env_atomic64 *a)
 {
 	return atomic_read(a);
 }
 
-static inline void env_atomic64_set(env_atomic64 *a, long i)
+static inline void
+env_atomic64_set(env_atomic64 *a, long i)
 {
 	atomic_set(a, i);
 }
 
-static inline void env_atomic64_add(long i, env_atomic64 *a)
+static inline void
+env_atomic64_add(long i, env_atomic64 *a)
 {
 	atomic_add(a, i);
 }
 
-static inline void env_atomic64_sub(long i, env_atomic64 *a)
+static inline void
+env_atomic64_sub(long i, env_atomic64 *a)
 {
 	atomic_sub(a, i);
 }
 
-static inline void env_atomic64_inc(env_atomic64 *a)
+static inline void
+env_atomic64_inc(env_atomic64 *a)
 {
 	atomic_inc(a);
 }
 
-static inline void env_atomic64_dec(env_atomic64 *a)
+static inline void
+env_atomic64_dec(env_atomic64 *a)
 {
 	atomic_dec(a);
 }
 
-static inline int env_atomic64_add_return(int i, env_atomic *a)
+static inline int
+env_atomic64_add_return(int i, env_atomic *a)
 {
 	return __sync_add_and_fetch(a, i);
 }
 
-static inline int env_atomic64_sub_return(int i, env_atomic *a)
+static inline int
+env_atomic64_sub_return(int i, env_atomic *a)
 {
 	return __sync_sub_and_fetch(a, i);
 }
 
-static inline int env_atomic64_inc_return(env_atomic *a)
+static inline int
+env_atomic64_inc_return(env_atomic *a)
 {
 	return env_atomic64_add_return(1, a);
 }
 
-static inline int env_atomic64_dec_return(env_atomic *a)
+static inline int
+env_atomic64_dec_return(env_atomic *a)
 {
 	return env_atomic_sub_return(1, a);
 }
 
-static inline long env_atomic64_cmpxchg(env_atomic64 *a, long old, long new)
+static inline long
+env_atomic64_cmpxchg(env_atomic64 *a, long old, long new)
 {
 	return atomic_cmpxchg(a, old, new);
 }
@@ -499,22 +560,26 @@ typedef struct completion {
 	sem_t sem;
 } env_completion;
 
-static inline void env_completion_init(env_completion *completion)
+static inline void
+env_completion_init(env_completion *completion)
 {
 	sem_init(&completion->sem, 0, 0);
 }
 
-static inline void env_completion_wait(env_completion *completion)
+static inline void
+env_completion_wait(env_completion *completion)
 {
 	sem_wait(&completion->sem);
 }
 
-static inline void env_completion_complete(env_completion *completion)
+static inline void
+env_completion_complete(env_completion *completion)
 {
 	sem_post(&completion->sem);
 }
 
-static inline void env_completion_destroy(env_completion *completion)
+static inline void
+env_completion_destroy(env_completion *completion)
 {
 	sem_destroy(&completion->sem);
 }
@@ -525,22 +590,26 @@ typedef struct {
 	pthread_spinlock_t lock;
 } env_spinlock;
 
-static inline int env_spinlock_init(env_spinlock *l)
+static inline int
+env_spinlock_init(env_spinlock *l)
 {
 	return pthread_spin_init(&l->lock, 0);
 }
 
-static inline int env_spinlock_trylock(env_spinlock *l)
+static inline int
+env_spinlock_trylock(env_spinlock *l)
 {
 	return pthread_spin_trylock(&l->lock) ? -OCF_ERR_NO_LOCK : 0;
 }
 
-static inline void env_spinlock_lock(env_spinlock *l)
+static inline void
+env_spinlock_lock(env_spinlock *l)
 {
 	ENV_BUG_ON(pthread_spin_lock(&l->lock));
 }
 
-static inline void env_spinlock_unlock(env_spinlock *l)
+static inline void
+env_spinlock_unlock(env_spinlock *l)
 {
 	ENV_BUG_ON(pthread_spin_unlock(&l->lock));
 }
@@ -553,7 +622,8 @@ static inline void env_spinlock_unlock(env_spinlock *l)
 		(void)flags; \
 		env_spinlock_unlock(l)
 
-static inline void env_spinlock_destroy(env_spinlock *l)
+static inline void
+env_spinlock_destroy(env_spinlock *l)
 {
 	ENV_BUG_ON(pthread_spin_destroy(&l->lock));
 }
@@ -564,37 +634,44 @@ typedef struct {
 	pthread_rwlock_t lock;
 } env_rwlock;
 
-static inline void env_rwlock_init(env_rwlock *l)
+static inline void
+env_rwlock_init(env_rwlock *l)
 {
 	ENV_BUG_ON(pthread_rwlock_init(&l->lock, NULL));
 }
 
-static inline void env_rwlock_read_lock(env_rwlock *l)
+static inline void
+env_rwlock_read_lock(env_rwlock *l)
 {
 	ENV_BUG_ON(pthread_rwlock_rdlock(&l->lock));
 }
 
-static inline void env_rwlock_read_unlock(env_rwlock *l)
+static inline void
+env_rwlock_read_unlock(env_rwlock *l)
 {
 	ENV_BUG_ON(pthread_rwlock_unlock(&l->lock));
 }
 
-static inline void env_rwlock_write_lock(env_rwlock *l)
+static inline void
+env_rwlock_write_lock(env_rwlock *l)
 {
 	ENV_BUG_ON(pthread_rwlock_wrlock(&l->lock));
 }
 
-static inline void env_rwlock_write_unlock(env_rwlock *l)
+static inline void
+env_rwlock_write_unlock(env_rwlock *l)
 {
 	ENV_BUG_ON(pthread_rwlock_unlock(&l->lock));
 }
 
-static inline void env_rwlock_destroy(env_rwlock *l)
+static inline void
+env_rwlock_destroy(env_rwlock *l)
 {
 	ENV_BUG_ON(pthread_rwlock_destroy(&l->lock));
 }
 
-static inline void env_bit_set(int nr, volatile void *addr)
+static inline void
+env_bit_set(int nr, volatile void *addr)
 {
 	char *byte = (char *)addr + (nr >> 3);
 	char mask = 1 << (nr & 7);
@@ -602,7 +679,8 @@ static inline void env_bit_set(int nr, volatile void *addr)
 	__sync_or_and_fetch(byte, mask);
 }
 
-static inline void env_bit_clear(int nr, volatile void *addr)
+static inline void
+env_bit_clear(int nr, volatile void *addr)
 {
 	char *byte = (char *)addr + (nr >> 3);
 	char mask = 1 << (nr & 7);
@@ -610,7 +688,8 @@ static inline void env_bit_clear(int nr, volatile void *addr)
 	__sync_and_and_fetch(byte, ~mask);
 }
 
-static inline bool env_bit_test(int nr, const volatile unsigned long *addr)
+static inline bool
+env_bit_test(int nr, const volatile unsigned long *addr)
 {
 	const char *byte = (char *)addr + (nr >> 3);
 	char mask = 1 << (nr & 7);
@@ -624,12 +703,14 @@ typedef struct {
 	sem_t sem;
 } env_waitqueue;
 
-static inline void env_waitqueue_init(env_waitqueue *w)
+static inline void
+env_waitqueue_init(env_waitqueue *w)
 {
 	sem_init(&w->sem, 0, 0);
 }
 
-static inline void env_waitqueue_wake_up(env_waitqueue *w)
+static inline void
+env_waitqueue_wake_up(env_waitqueue *w)
 {
 	sem_post(&w->sem);
 }
@@ -645,43 +726,51 @@ static inline void env_waitqueue_wake_up(env_waitqueue *w)
 /* *** SCHEDULING *** */
 
 /* CAS does not need this while in user-space */
-static inline void env_schedule(void)
+static inline void
+env_schedule(void)
 {
 }
 
 #define env_cond_resched	env_schedule
 
-static inline int env_in_interrupt(void)
+static inline int
+env_in_interrupt(void)
 {
 	return 0;
 }
 
-static inline uint64_t env_get_tick_count(void)
+static inline uint64_t
+env_get_tick_count(void)
 {
 	return spdk_get_ticks();
 }
 
-static inline uint64_t env_ticks_to_secs(uint64_t j)
+static inline uint64_t
+env_ticks_to_secs(uint64_t j)
 {
 	return j / spdk_get_ticks_hz();
 }
 
-static inline uint64_t env_ticks_to_msecs(uint64_t j)
+static inline uint64_t
+env_ticks_to_msecs(uint64_t j)
 {
 	return env_ticks_to_secs(j) * 1000;
 }
 
-static inline uint64_t env_ticks_to_nsecs(uint64_t j)
+static inline uint64_t
+env_ticks_to_nsecs(uint64_t j)
 {
 	return env_ticks_to_secs(j) * 1000 * 1000;
 }
 
-static inline uint64_t env_ticks_to_usecs(uint64_t j)
+static inline uint64_t
+env_ticks_to_usecs(uint64_t j)
 {
 	return env_ticks_to_secs(j) * 1000 * 1000 * 1000;
 }
 
-static inline uint64_t env_secs_to_ticks(uint64_t j)
+static inline uint64_t
+env_secs_to_ticks(uint64_t j)
 {
 	return j * spdk_get_ticks_hz();
 }
@@ -691,7 +780,8 @@ static inline uint64_t env_secs_to_ticks(uint64_t j)
 /* 512 KB is sufficient amount of memory for OCF operations */
 #define ENV_MAX_MEM (512 * 1024)
 
-static inline int env_memset(void *dest, size_t len, uint8_t value)
+static inline int
+env_memset(void *dest, size_t len, uint8_t value)
 {
 	if (dest == NULL || len == 0) {
 		return 1;
@@ -701,7 +791,8 @@ static inline int env_memset(void *dest, size_t len, uint8_t value)
 	return 0;
 }
 
-static inline int env_memcpy(void *dest, size_t dmax, const void *src, size_t len)
+static inline int
+env_memcpy(void *dest, size_t dmax, const void *src, size_t len)
 {
 	if (dest == NULL || src == NULL) {
 		return 1;
@@ -717,8 +808,9 @@ static inline int env_memcpy(void *dest, size_t dmax, const void *src, size_t le
 	return 0;
 }
 
-static inline int env_memcmp(const void *aptr, size_t dmax, const void *bptr, size_t len,
-			     int *diff)
+static inline int
+env_memcmp(const void *aptr, size_t dmax, const void *bptr, size_t len,
+	   int *diff)
 {
 	if (diff == NULL || aptr == NULL || bptr == NULL) {
 		return 1;
@@ -737,12 +829,14 @@ static inline int env_memcmp(const void *aptr, size_t dmax, const void *bptr, si
 /* 4096 is sufficient max length for any OCF operation on string */
 #define ENV_MAX_STR (4 * 1024)
 
-static inline size_t env_strnlen(const char *src, size_t dmax)
+static inline size_t
+env_strnlen(const char *src, size_t dmax)
 {
 	return strnlen(src, dmax);
 }
 
-static inline int env_strncpy(char *dest, size_t dmax, const char *src, size_t len)
+static inline int
+env_strncpy(char *dest, size_t dmax, const char *src, size_t len)
 {
 	if (dest == NULL  || src == NULL) {
 		return 1;
@@ -762,7 +856,8 @@ static inline int env_strncpy(char *dest, size_t dmax, const char *src, size_t l
 
 #define env_strncmp(s1, slen1, s2, slen2) strncmp(s1, s2, min(slen1, slen2))
 
-static inline char *env_strdup(const char *src, int flags)
+static inline char *
+env_strdup(const char *src, int flags)
 {
 	int len;
 	char *ret;
@@ -783,19 +878,22 @@ static inline char *env_strdup(const char *src, int flags)
 
 /* *** SORTING *** */
 
-static inline void env_sort(void *base, size_t num, size_t size,
-			    int (*cmp_fn)(const void *, const void *),
-			    void (*swap_fn)(void *, void *, int size))
+static inline void
+env_sort(void *base, size_t num, size_t size,
+	 int (*cmp_fn)(const void *, const void *),
+	 void (*swap_fn)(void *, void *, int size))
 {
 	qsort(base, num, size, cmp_fn);
 }
 
-static inline void env_msleep(uint64_t n)
+static inline void
+env_msleep(uint64_t n)
 {
 	usleep(n * 1000);
 }
 
-static inline void env_touch_softlockup_wd(void)
+static inline void
+env_touch_softlockup_wd(void)
 {
 }
 
diff --git a/lib/env_ocf/ocf_env_list.h b/lib/env_ocf/ocf_env_list.h
index ecf9ebc05..dd7963b86 100644
--- a/lib/env_ocf/ocf_env_list.h
+++ b/lib/env_ocf/ocf_env_list.h
@@ -27,7 +27,8 @@ struct list_head {
  * @param it list entry to be added
  * @param l1 list main node (head)
  */
-static inline void list_add(struct list_head *it, struct list_head *l1)
+static inline void
+list_add(struct list_head *it, struct list_head *l1)
 {
 	it->prev = l1;
 	it->next = l1->next;
@@ -41,7 +42,8 @@ static inline void list_add(struct list_head *it, struct list_head *l1)
  * @param it list entry to be added
  * @param l1 list main node (head)
  */
-static inline void list_add_tail(struct list_head *it, struct list_head *l1)
+static inline void
+list_add_tail(struct list_head *it, struct list_head *l1)
 {
 	it->prev = l1->prev;
 	it->next = l1;
@@ -53,7 +55,8 @@ static inline void list_add_tail(struct list_head *it, struct list_head *l1)
 /**
  * check if a list is empty (return true)
  */
-static inline int list_empty(struct list_head *it)
+static inline int
+list_empty(struct list_head *it)
 {
 	return it->next == it;
 }
@@ -61,21 +64,24 @@ static inline int list_empty(struct list_head *it)
 /**
  * delete an entry from a list
  */
-static inline void list_del(struct list_head *it)
+static inline void
+list_del(struct list_head *it)
 {
 	it->next->prev = it->prev;
 	it->prev->next = it->next;
 }
 
-static inline void list_move_tail(struct list_head *list,
-				  struct list_head *head)
+static inline void
+list_move_tail(struct list_head *list,
+	       struct list_head *head)
 {
 	list_del(list);
 	list_add_tail(list, head);
 }
 
-static inline void list_move(struct list_head *list,
-			     struct list_head *head)
+static inline void
+list_move(struct list_head *list,
+	  struct list_head *head)
 {
 	list_del(list);
 	list_add(list, head);
diff --git a/lib/ftl/ftl_io.c b/lib/ftl/ftl_io.c
index a199c5f54..690d1db11 100644
--- a/lib/ftl/ftl_io.c
+++ b/lib/ftl/ftl_io.c
@@ -419,7 +419,8 @@ ftl_io_alloc_child(struct ftl_io *parent)
 	return io;
 }
 
-void ftl_io_fail(struct ftl_io *io, int status)
+void
+ftl_io_fail(struct ftl_io *io, int status)
 {
 	io->status = status;
 	ftl_io_advance(io, io->num_blocks - io->pos);
diff --git a/lib/ftl/ftl_restore.c b/lib/ftl/ftl_restore.c
index 77978f460..b89deae17 100644
--- a/lib/ftl/ftl_restore.c
+++ b/lib/ftl/ftl_restore.c
@@ -108,12 +108,9 @@ struct ftl_restore {
 	struct ftl_nv_cache_restore	nv_cache;
 };
 
-static int
-ftl_restore_tail_md(struct ftl_restore_band *rband);
-static void
-ftl_pad_zone_cb(struct ftl_io *io, void *arg, int status);
-static void
-ftl_restore_pad_band(struct ftl_restore_band *rband);
+static int ftl_restore_tail_md(struct ftl_restore_band *rband);
+static void ftl_pad_zone_cb(struct ftl_io *io, void *arg, int status);
+static void ftl_restore_pad_band(struct ftl_restore_band *rband);
 
 static void
 ftl_restore_free(struct ftl_restore *restore)
diff --git a/lib/ioat/ioat.c b/lib/ioat/ioat.c
index 36148556f..6d9687be8 100644
--- a/lib/ioat/ioat.c
+++ b/lib/ioat/ioat.c
@@ -229,7 +229,8 @@ ioat_prep_fill(struct spdk_ioat_chan *ioat, uint64_t dst,
 	return desc;
 }
 
-static int ioat_reset_hw(struct spdk_ioat_chan *ioat)
+static int
+ioat_reset_hw(struct spdk_ioat_chan *ioat)
 {
 	int timeout;
 	uint64_t status;
diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c
index 3fe180056..911221a3e 100644
--- a/lib/iscsi/conn.c
+++ b/lib/iscsi/conn.c
@@ -92,7 +92,8 @@ _iscsi_conns_cleanup(void)
 	free(g_conns_array);
 }
 
-int initialize_iscsi_conns(void)
+int
+initialize_iscsi_conns(void)
 {
 	uint32_t i;
 
diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c
index 2e40d34f6..ae4ad5f09 100644
--- a/lib/iscsi/iscsi.c
+++ b/lib/iscsi/iscsi.c
@@ -502,7 +502,8 @@ end:
 	return iovcnt - sgl.iovcnt;
 }
 
-void iscsi_free_sess(struct spdk_iscsi_sess *sess)
+void
+iscsi_free_sess(struct spdk_iscsi_sess *sess)
 {
 	if (sess == NULL) {
 		return;
@@ -2449,7 +2450,8 @@ iscsi_pdu_payload_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p
 	return 0;
 }
 
-static void iscsi_conn_logout_pdu_complete(void *arg)
+static void
+iscsi_conn_logout_pdu_complete(void *arg)
 {
 	struct spdk_iscsi_conn *conn = arg;
 
@@ -2809,9 +2811,10 @@ iscsi_del_transfer_task(struct spdk_iscsi_conn *conn, uint32_t task_tag)
 	return false;
 }
 
-void iscsi_clear_all_transfer_task(struct spdk_iscsi_conn *conn,
-				   struct spdk_scsi_lun *lun,
-				   struct spdk_iscsi_pdu *pdu)
+void
+iscsi_clear_all_transfer_task(struct spdk_iscsi_conn *conn,
+			      struct spdk_scsi_lun *lun,
+			      struct spdk_iscsi_pdu *pdu)
 {
 	struct spdk_iscsi_task *task, *task_tmp;
 	struct spdk_iscsi_pdu *pdu_tmp;
@@ -3072,8 +3075,9 @@ iscsi_transfer_in(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *task)
 	return sent_status;
 }
 
-void iscsi_task_response(struct spdk_iscsi_conn *conn,
-			 struct spdk_iscsi_task *task)
+void
+iscsi_task_response(struct spdk_iscsi_conn *conn,
+		    struct spdk_iscsi_task *task)
 {
 	struct spdk_iscsi_pdu *rsp_pdu;
 	struct iscsi_bhs_scsi_resp *rsph;
diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c
index 13a8268c0..d5d7e217b 100644
--- a/lib/iscsi/iscsi_subsystem.c
+++ b/lib/iscsi/iscsi_subsystem.c
@@ -185,7 +185,8 @@ iscsi_free_pools(void)
 	spdk_mempool_free(iscsi->task_pool);
 }
 
-void iscsi_put_pdu(struct spdk_iscsi_pdu *pdu)
+void
+iscsi_put_pdu(struct spdk_iscsi_pdu *pdu)
 {
 	if (!pdu) {
 		return;
diff --git a/lib/iscsi/md5.c b/lib/iscsi/md5.c
index 6d822a64c..239905558 100644
--- a/lib/iscsi/md5.c
+++ b/lib/iscsi/md5.c
@@ -7,7 +7,8 @@
 #include "spdk/stdinc.h"
 #include "iscsi/md5.h"
 
-int md5init(struct spdk_md5ctx *md5ctx)
+int
+md5init(struct spdk_md5ctx *md5ctx)
 {
 	int rc;
 
@@ -29,7 +30,8 @@ int md5init(struct spdk_md5ctx *md5ctx)
 	return rc;
 }
 
-int md5final(void *md5, struct spdk_md5ctx *md5ctx)
+int
+md5final(void *md5, struct spdk_md5ctx *md5ctx)
 {
 	int rc;
 
@@ -42,7 +44,8 @@ int md5final(void *md5, struct spdk_md5ctx *md5ctx)
 	return rc;
 }
 
-int md5update(struct spdk_md5ctx *md5ctx, const void *data, size_t len)
+int
+md5update(struct spdk_md5ctx *md5ctx, const void *data, size_t len)
 {
 	int rc;
 
diff --git a/lib/iscsi/param.h b/lib/iscsi/param.h
index 78e79e610..020037418 100644
--- a/lib/iscsi/param.h
+++ b/lib/iscsi/param.h
@@ -32,28 +32,20 @@ struct iscsi_param {
 	int state_index;
 };
 
-void
-iscsi_param_free(struct iscsi_param *params);
+void iscsi_param_free(struct iscsi_param *params);
 struct iscsi_param *
 iscsi_param_find(struct iscsi_param *params, const char *key);
-int
-iscsi_param_del(struct iscsi_param **params, const char *key);
-int
-iscsi_param_add(struct iscsi_param **params, const char *key,
-		const char *val, const char *list, int type);
-int
-iscsi_param_set(struct iscsi_param *params, const char *key,
-		const char *val);
-int
-iscsi_param_set_int(struct iscsi_param *params, const char *key, uint32_t val);
-int
-iscsi_parse_params(struct iscsi_param **params, const uint8_t *data,
-		   int len, bool cbit_enabled, char **partial_parameter);
-char *
-iscsi_param_get_val(struct iscsi_param *params, const char *key);
-int
-iscsi_param_eq_val(struct iscsi_param *params, const char *key,
-		   const char *val);
+int iscsi_param_del(struct iscsi_param **params, const char *key);
+int iscsi_param_add(struct iscsi_param **params, const char *key,
+		    const char *val, const char *list, int type);
+int iscsi_param_set(struct iscsi_param *params, const char *key,
+		    const char *val);
+int iscsi_param_set_int(struct iscsi_param *params, const char *key, uint32_t val);
+int iscsi_parse_params(struct iscsi_param **params, const uint8_t *data,
+		       int len, bool cbit_enabled, char **partial_parameter);
+char *iscsi_param_get_val(struct iscsi_param *params, const char *key);
+int iscsi_param_eq_val(struct iscsi_param *params, const char *key,
+		       const char *val);
 
 int iscsi_negotiate_params(struct spdk_iscsi_conn *conn,
 			   struct iscsi_param **params_p, uint8_t *data,
diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c
index 8eb8405da..f38bcb3d4 100644
--- a/lib/iscsi/tgt_node.c
+++ b/lib/iscsi/tgt_node.c
@@ -201,9 +201,8 @@ iscsi_init_grp_allow_iscsi_name(struct spdk_iscsi_init_grp *igp,
 	return -1;
 }
 
-static struct spdk_iscsi_pg_map *
-iscsi_tgt_node_find_pg_map(struct spdk_iscsi_tgt_node *target,
-			   struct spdk_iscsi_portal_grp *pg);
+static struct spdk_iscsi_pg_map *iscsi_tgt_node_find_pg_map(struct spdk_iscsi_tgt_node *target,
+		struct spdk_iscsi_portal_grp *pg);
 
 bool
 iscsi_tgt_node_access(struct spdk_iscsi_conn *conn,
@@ -1220,8 +1219,9 @@ iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn,
 	return 0;
 }
 
-void iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group,
-			       struct spdk_iscsi_init_grp *initiator_group)
+void
+iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group,
+			  struct spdk_iscsi_init_grp *initiator_group)
 {
 	struct spdk_iscsi_tgt_node *target;
 
diff --git a/lib/json/json_write.c b/lib/json/json_write.c
index 8c21eb0ba..e8efd6318 100644
--- a/lib/json/json_write.c
+++ b/lib/json/json_write.c
@@ -661,70 +661,80 @@ spdk_json_write_val(struct spdk_json_write_ctx *w, const struct spdk_json_val *v
 	return fail(w);
 }
 
-int spdk_json_write_named_null(struct spdk_json_write_ctx *w, const char *name)
+int
+spdk_json_write_named_null(struct spdk_json_write_ctx *w, const char *name)
 {
 	int rc = spdk_json_write_name(w, name);
 	return rc ? rc : spdk_json_write_null(w);
 }
 
-int spdk_json_write_named_bool(struct spdk_json_write_ctx *w, const char *name, bool val)
+int
+spdk_json_write_named_bool(struct spdk_json_write_ctx *w, const char *name, bool val)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_bool(w, val);
 }
 
-int spdk_json_write_named_uint8(struct spdk_json_write_ctx *w, const char *name, uint8_t val)
+int
+spdk_json_write_named_uint8(struct spdk_json_write_ctx *w, const char *name, uint8_t val)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_uint8(w, val);
 }
 
-int spdk_json_write_named_uint16(struct spdk_json_write_ctx *w, const char *name, uint16_t val)
+int
+spdk_json_write_named_uint16(struct spdk_json_write_ctx *w, const char *name, uint16_t val)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_uint16(w, val);
 }
 
-int spdk_json_write_named_int32(struct spdk_json_write_ctx *w, const char *name, int32_t val)
+int
+spdk_json_write_named_int32(struct spdk_json_write_ctx *w, const char *name, int32_t val)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_int32(w, val);
 }
 
-int spdk_json_write_named_uint32(struct spdk_json_write_ctx *w, const char *name, uint32_t val)
+int
+spdk_json_write_named_uint32(struct spdk_json_write_ctx *w, const char *name, uint32_t val)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_uint32(w, val);
 }
 
-int spdk_json_write_named_int64(struct spdk_json_write_ctx *w, const char *name, int64_t val)
+int
+spdk_json_write_named_int64(struct spdk_json_write_ctx *w, const char *name, int64_t val)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_int64(w, val);
 }
 
-int spdk_json_write_named_uint64(struct spdk_json_write_ctx *w, const char *name, uint64_t val)
+int
+spdk_json_write_named_uint64(struct spdk_json_write_ctx *w, const char *name, uint64_t val)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_uint64(w, val);
 }
 
-int spdk_json_write_named_string(struct spdk_json_write_ctx *w, const char *name, const char *val)
+int
+spdk_json_write_named_string(struct spdk_json_write_ctx *w, const char *name, const char *val)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_string(w, val);
 }
 
-int spdk_json_write_named_string_fmt(struct spdk_json_write_ctx *w, const char *name,
-				     const char *fmt, ...)
+int
+spdk_json_write_named_string_fmt(struct spdk_json_write_ctx *w, const char *name,
+				 const char *fmt, ...)
 {
 	va_list args;
 	int rc;
@@ -736,8 +746,9 @@ int spdk_json_write_named_string_fmt(struct spdk_json_write_ctx *w, const char *
 	return rc;
 }
 
-int spdk_json_write_named_string_fmt_v(struct spdk_json_write_ctx *w, const char *name,
-				       const char *fmt, va_list args)
+int
+spdk_json_write_named_string_fmt_v(struct spdk_json_write_ctx *w, const char *name,
+				   const char *fmt, va_list args)
 {
 	char *s;
 	int rc;
@@ -767,14 +778,16 @@ spdk_json_write_named_bytearray(struct spdk_json_write_ctx *w, const char *name,
 	return rc ? rc : spdk_json_write_bytearray(w, val, len);
 }
 
-int spdk_json_write_named_array_begin(struct spdk_json_write_ctx *w, const char *name)
+int
+spdk_json_write_named_array_begin(struct spdk_json_write_ctx *w, const char *name)
 {
 	int rc = spdk_json_write_name(w, name);
 
 	return rc ? rc : spdk_json_write_array_begin(w);
 }
 
-int spdk_json_write_named_object_begin(struct spdk_json_write_ctx *w, const char *name)
+int
+spdk_json_write_named_object_begin(struct spdk_json_write_ctx *w, const char *name)
 {
 	int rc = spdk_json_write_name(w, name);
 
diff --git a/lib/jsonrpc/jsonrpc_client_tcp.c b/lib/jsonrpc/jsonrpc_client_tcp.c
index 2e54b262a..c0cb59232 100644
--- a/lib/jsonrpc/jsonrpc_client_tcp.c
+++ b/lib/jsonrpc/jsonrpc_client_tcp.c
@@ -355,8 +355,9 @@ spdk_jsonrpc_client_poll(struct spdk_jsonrpc_client *client, int timeout)
 	}
 }
 
-int spdk_jsonrpc_client_send_request(struct spdk_jsonrpc_client *client,
-				     struct spdk_jsonrpc_client_request *req)
+int
+spdk_jsonrpc_client_send_request(struct spdk_jsonrpc_client *client,
+				 struct spdk_jsonrpc_client_request *req)
 {
 	if (client->request != NULL) {
 		return -ENOSPC;
diff --git a/lib/nbd/nbd.c b/lib/nbd/nbd.c
index d7fa0fd16..3440b6f2b 100644
--- a/lib/nbd/nbd.c
+++ b/lib/nbd/nbd.c
@@ -100,10 +100,8 @@ static void *g_fini_cb_arg;
 
 static void _nbd_fini(void *arg1);
 
-static int
-nbd_submit_bdev_io(struct spdk_nbd_disk *nbd, struct nbd_io *io);
-static int
-nbd_io_recv_internal(struct spdk_nbd_disk *nbd);
+static int nbd_submit_bdev_io(struct spdk_nbd_disk *nbd, struct nbd_io *io);
+static int nbd_io_recv_internal(struct spdk_nbd_disk *nbd);
 
 int
 spdk_nbd_init(void)
diff --git a/lib/nvme/nvme_ctrlr.c b/lib/nvme/nvme_ctrlr.c
index cecb5b2d1..a1acc53fd 100644
--- a/lib/nvme/nvme_ctrlr.c
+++ b/lib/nvme/nvme_ctrlr.c
@@ -674,7 +674,8 @@ nvme_ctrlr_set_intel_support_log_pages_done(void *arg, const struct spdk_nvme_cp
 	free(ctx);
 }
 
-static int nvme_ctrlr_set_intel_support_log_pages(struct spdk_nvme_ctrlr *ctrlr)
+static int
+nvme_ctrlr_set_intel_support_log_pages(struct spdk_nvme_ctrlr *ctrlr)
 {
 	int rc = 0;
 	struct intel_log_pages_ctx *ctx;
@@ -4929,7 +4930,8 @@ spdk_nvme_ctrlr_unmap_pmr(struct spdk_nvme_ctrlr *ctrlr)
 	return rc;
 }
 
-int spdk_nvme_ctrlr_read_boot_partition_start(struct spdk_nvme_ctrlr *ctrlr, void *payload,
+int
+spdk_nvme_ctrlr_read_boot_partition_start(struct spdk_nvme_ctrlr *ctrlr, void *payload,
 		uint32_t bprsz, uint32_t bprof, uint32_t bpid)
 {
 	union spdk_nvme_bprsel_register bprsel;
@@ -4986,7 +4988,8 @@ int spdk_nvme_ctrlr_read_boot_partition_start(struct spdk_nvme_ctrlr *ctrlr, voi
 	return 0;
 }
 
-int spdk_nvme_ctrlr_read_boot_partition_poll(struct spdk_nvme_ctrlr *ctrlr)
+int
+spdk_nvme_ctrlr_read_boot_partition_poll(struct spdk_nvme_ctrlr *ctrlr)
 {
 	int rc = 0;
 	union spdk_nvme_bpinfo_register bpinfo;
@@ -5092,9 +5095,10 @@ nvme_write_boot_partition_cb(void *arg, const struct spdk_nvme_cpl *cpl)
 	}
 }
 
-int spdk_nvme_ctrlr_write_boot_partition(struct spdk_nvme_ctrlr *ctrlr,
-		void *payload, uint32_t size, uint32_t bpid,
-		spdk_nvme_cmd_cb cb_fn, void *cb_arg)
+int
+spdk_nvme_ctrlr_write_boot_partition(struct spdk_nvme_ctrlr *ctrlr,
+				     void *payload, uint32_t size, uint32_t bpid,
+				     spdk_nvme_cmd_cb cb_fn, void *cb_arg)
 {
 	int res;
 
diff --git a/lib/nvme/nvme_ctrlr_cmd.c b/lib/nvme/nvme_ctrlr_cmd.c
index 57f7a7f0d..093fddab2 100644
--- a/lib/nvme/nvme_ctrlr_cmd.c
+++ b/lib/nvme/nvme_ctrlr_cmd.c
@@ -379,10 +379,11 @@ spdk_nvme_ctrlr_cmd_get_feature_ns(struct spdk_nvme_ctrlr *ctrlr, uint8_t featur
 	return rc;
 }
 
-int spdk_nvme_ctrlr_cmd_set_feature_ns(struct spdk_nvme_ctrlr *ctrlr, uint8_t feature,
-				       uint32_t cdw11, uint32_t cdw12, void *payload,
-				       uint32_t payload_size, spdk_nvme_cmd_cb cb_fn,
-				       void *cb_arg, uint32_t ns_id)
+int
+spdk_nvme_ctrlr_cmd_set_feature_ns(struct spdk_nvme_ctrlr *ctrlr, uint8_t feature,
+				   uint32_t cdw11, uint32_t cdw12, void *payload,
+				   uint32_t payload_size, spdk_nvme_cmd_cb cb_fn,
+				   void *cb_arg, uint32_t ns_id)
 {
 	struct nvme_request *req;
 	struct spdk_nvme_cmd *cmd;
diff --git a/lib/nvme/nvme_cuse.c b/lib/nvme/nvme_cuse.c
index c0d563d24..9aac6634e 100644
--- a/lib/nvme/nvme_cuse.c
+++ b/lib/nvme/nvme_cuse.c
@@ -828,7 +828,8 @@ cuse_ns_ioctl(fuse_req_t req, int cmd, void *arg,
  * CUSE threads initialization.
  */
 
-static void cuse_open(fuse_req_t req, struct fuse_file_info *fi)
+static void
+cuse_open(fuse_req_t req, struct fuse_file_info *fi)
 {
 	fuse_reply_open(req, fi);
 }
@@ -843,7 +844,8 @@ static const struct cuse_lowlevel_ops cuse_ns_clop = {
 	.ioctl		= cuse_ns_ioctl,
 };
 
-static int cuse_session_create(struct cuse_device *cuse_device)
+static int
+cuse_session_create(struct cuse_device *cuse_device)
 {
 	char *cuse_argv[] = { "cuse", "-f" };
 	int multithreaded;
diff --git a/lib/nvme/nvme_ns.c b/lib/nvme/nvme_ns.c
index b8d01e7e3..36d979f42 100644
--- a/lib/nvme/nvme_ns.c
+++ b/lib/nvme/nvme_ns.c
@@ -324,7 +324,12 @@ spdk_nvme_ns_get_data(struct spdk_nvme_ns *ns)
 	return _nvme_ns_get_data(ns);
 }
 
-enum spdk_nvme_dealloc_logical_block_read_value spdk_nvme_ns_get_dealloc_logical_block_read_value(
+/* We have to use the typedef in the function declaration to appease astyle. */
+typedef enum spdk_nvme_dealloc_logical_block_read_value
+spdk_nvme_dealloc_logical_block_read_value_t;
+
+spdk_nvme_dealloc_logical_block_read_value_t
+spdk_nvme_ns_get_dealloc_logical_block_read_value(
 	struct spdk_nvme_ns *ns)
 {
 	struct spdk_nvme_ctrlr *ctrlr = ns->ctrlr;
@@ -492,8 +497,9 @@ spdk_nvme_ns_get_ana_state(const struct spdk_nvme_ns *ns) {
 	return ns->ana_state;
 }
 
-int nvme_ns_construct(struct spdk_nvme_ns *ns, uint32_t id,
-		      struct spdk_nvme_ctrlr *ctrlr)
+int
+nvme_ns_construct(struct spdk_nvme_ns *ns, uint32_t id,
+		  struct spdk_nvme_ctrlr *ctrlr)
 {
 	int	rc;
 
@@ -530,7 +536,8 @@ int nvme_ns_construct(struct spdk_nvme_ns *ns, uint32_t id,
 	return 0;
 }
 
-void nvme_ns_destruct(struct spdk_nvme_ns *ns)
+void
+nvme_ns_destruct(struct spdk_nvme_ns *ns)
 {
 	struct spdk_nvme_ns_data *nsdata;
 
diff --git a/lib/nvme/nvme_opal.c b/lib/nvme/nvme_opal.c
index adeab3f1e..a590ef5c7 100644
--- a/lib/nvme/nvme_opal.c
+++ b/lib/nvme/nvme_opal.c
@@ -1320,7 +1320,8 @@ opal_lock_unlock_range(struct spdk_opal_dev *dev, struct opal_session *sess,
 	return opal_parse_and_check_status(sess);
 }
 
-static int opal_generic_locking_range_enable_disable(struct spdk_opal_dev *dev,
+static int
+opal_generic_locking_range_enable_disable(struct spdk_opal_dev *dev,
 		struct opal_session *sess,
 		uint8_t *uid, bool read_lock_enabled, bool write_lock_enabled)
 {
diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c
index 8146cf4c7..d724d1ce1 100644
--- a/lib/nvme/nvme_pcie.c
+++ b/lib/nvme/nvme_pcie.c
@@ -873,9 +873,10 @@ nvme_pcie_ctrlr_scan(struct spdk_nvme_probe_ctx *probe_ctx,
 	}
 }
 
-static struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_transport_id *trid,
-		const struct spdk_nvme_ctrlr_opts *opts,
-		void *devhandle)
+static struct spdk_nvme_ctrlr *
+	nvme_pcie_ctrlr_construct(const struct spdk_nvme_transport_id *trid,
+			  const struct spdk_nvme_ctrlr_opts *opts,
+			  void *devhandle)
 {
 	struct spdk_pci_device *pci_dev = devhandle;
 	struct nvme_pcie_ctrlr *pctrlr;
diff --git a/lib/nvme/nvme_pcie_common.c b/lib/nvme/nvme_pcie_common.c
index 88209f9ec..2e0f82456 100644
--- a/lib/nvme/nvme_pcie_common.c
+++ b/lib/nvme/nvme_pcie_common.c
@@ -21,8 +21,8 @@ __thread struct nvme_pcie_ctrlr *g_thread_mmio_ctrlr = NULL;
 
 static struct spdk_nvme_pcie_stat g_dummy_stat = {};
 
-static void
-nvme_pcie_fail_request_bad_vtophys(struct spdk_nvme_qpair *qpair, struct nvme_tracker *tr);
+static void nvme_pcie_fail_request_bad_vtophys(struct spdk_nvme_qpair *qpair,
+		struct nvme_tracker *tr);
 
 static inline uint64_t
 nvme_pcie_vtophys(struct spdk_nvme_ctrlr *ctrlr, const void *buf, uint64_t *size)
diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c
index 9db725afb..5a177b789 100644
--- a/lib/nvme/nvme_rdma.c
+++ b/lib/nvme/nvme_rdma.c
@@ -2194,9 +2194,13 @@ nvme_rdma_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr)
 
 static int nvme_rdma_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr);
 
-static struct spdk_nvme_ctrlr *nvme_rdma_ctrlr_construct(const struct spdk_nvme_transport_id *trid,
-		const struct spdk_nvme_ctrlr_opts *opts,
-		void *devhandle)
+/* We have to use the typedef in the function declaration to appease astyle. */
+typedef struct spdk_nvme_ctrlr spdk_nvme_ctrlr_t;
+
+static spdk_nvme_ctrlr_t *
+nvme_rdma_ctrlr_construct(const struct spdk_nvme_transport_id *trid,
+			  const struct spdk_nvme_ctrlr_opts *opts,
+			  void *devhandle)
 {
 	struct nvme_rdma_ctrlr *rctrlr;
 	struct ibv_context **contexts;
diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c
index 518f24a6f..4bb8f8a26 100644
--- a/lib/nvme/nvme_tcp.c
+++ b/lib/nvme/nvme_tcp.c
@@ -2093,9 +2093,13 @@ nvme_tcp_ctrlr_create_io_qpair(struct spdk_nvme_ctrlr *ctrlr, uint16_t qid,
 					   opts->io_queue_requests, opts->async_mode);
 }
 
-static struct spdk_nvme_ctrlr *nvme_tcp_ctrlr_construct(const struct spdk_nvme_transport_id *trid,
-		const struct spdk_nvme_ctrlr_opts *opts,
-		void *devhandle)
+/* We have to use the typedef in the function declaration to appease astyle. */
+typedef struct spdk_nvme_ctrlr spdk_nvme_ctrlr_t;
+
+static spdk_nvme_ctrlr_t *
+nvme_tcp_ctrlr_construct(const struct spdk_nvme_transport_id *trid,
+			 const struct spdk_nvme_ctrlr_opts *opts,
+			 void *devhandle)
 {
 	struct nvme_tcp_ctrlr *tctrlr;
 	int rc;
diff --git a/lib/nvme/nvme_transport.c b/lib/nvme/nvme_transport.c
index 37a7c7860..f84558a1e 100644
--- a/lib/nvme/nvme_transport.c
+++ b/lib/nvme/nvme_transport.c
@@ -71,7 +71,8 @@ spdk_nvme_transport_available_by_name(const char *transport_name)
 	return nvme_get_transport(transport_name) == NULL ? false : true;
 }
 
-void spdk_nvme_transport_register(const struct spdk_nvme_transport_ops *ops)
+void
+spdk_nvme_transport_register(const struct spdk_nvme_transport_ops *ops)
 {
 	struct spdk_nvme_transport *new_transport;
 
@@ -769,7 +770,8 @@ nvme_transport_poll_group_free_stats(struct spdk_nvme_transport_poll_group *tgro
 	}
 }
 
-enum spdk_nvme_transport_type nvme_transport_get_trtype(const struct spdk_nvme_transport *transport)
+spdk_nvme_transport_type_t
+nvme_transport_get_trtype(const struct spdk_nvme_transport *transport)
 {
 	return transport->ops.type;
 }
diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c
index 80ebd41ba..25c3885a9 100644
--- a/lib/nvmf/ctrlr.c
+++ b/lib/nvmf/ctrlr.c
@@ -4200,7 +4200,8 @@ spdk_nvmf_request_exec_fabrics(struct spdk_nvmf_request *req)
 	}
 }
 
-static bool nvmf_check_subsystem_active(struct spdk_nvmf_request *req)
+static bool
+nvmf_check_subsystem_active(struct spdk_nvmf_request *req)
 {
 	struct spdk_nvmf_qpair *qpair = req->qpair;
 	struct spdk_nvmf_subsystem_poll_group *sgroup = NULL;
@@ -4446,7 +4447,8 @@ struct spdk_nvmf_subsystem *spdk_nvmf_request_get_subsystem(struct spdk_nvmf_req
 	return req->qpair->ctrlr->subsys;
 }
 
-void spdk_nvmf_request_get_data(struct spdk_nvmf_request *req, void **data, uint32_t *length)
+void
+spdk_nvmf_request_get_data(struct spdk_nvmf_request *req, void **data, uint32_t *length)
 {
 	*data = req->data;
 	*length = req->length;
@@ -4457,7 +4459,8 @@ struct spdk_nvmf_subsystem *spdk_nvmf_ctrlr_get_subsystem(struct spdk_nvmf_ctrlr
 	return ctrlr->subsys;
 }
 
-uint16_t spdk_nvmf_ctrlr_get_id(struct spdk_nvmf_ctrlr *ctrlr)
+uint16_t
+spdk_nvmf_ctrlr_get_id(struct spdk_nvmf_ctrlr *ctrlr)
 {
 	return ctrlr->cntlid;
 }
diff --git a/lib/nvmf/ctrlr_bdev.c b/lib/nvmf/ctrlr_bdev.c
index feac18f10..0b6ecbbb9 100644
--- a/lib/nvmf/ctrlr_bdev.c
+++ b/lib/nvmf/ctrlr_bdev.c
@@ -549,10 +549,9 @@ nvmf_bdev_ctrlr_unmap_cpl(struct spdk_bdev_io *bdev_io, bool success,
 	spdk_bdev_free_io(bdev_io);
 }
 
-static int
-nvmf_bdev_ctrlr_unmap(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,
-		      struct spdk_io_channel *ch, struct spdk_nvmf_request *req,
-		      struct nvmf_bdev_ctrlr_unmap *unmap_ctx);
+static int nvmf_bdev_ctrlr_unmap(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,
+				 struct spdk_io_channel *ch, struct spdk_nvmf_request *req,
+				 struct nvmf_bdev_ctrlr_unmap *unmap_ctx);
 static void
 nvmf_bdev_ctrlr_unmap_resubmit(void *arg)
 {
diff --git a/lib/nvmf/fc.c b/lib/nvmf/fc.c
index 2efcb8990..715c0d1ed 100644
--- a/lib/nvmf/fc.c
+++ b/lib/nvmf/fc.c
@@ -1932,8 +1932,7 @@ nvmf_fc_opts_init(struct spdk_nvmf_transport_opts *opts)
 	opts->num_shared_buffers =   SPDK_NVMF_FC_DEFAULT_NUM_SHARED_BUFFERS;
 }
 
-static int
-nvmf_fc_accept(void *ctx);
+static int nvmf_fc_accept(void *ctx);
 
 static struct spdk_nvmf_transport *
 nvmf_fc_create(struct spdk_nvmf_transport_opts *opts)
diff --git a/lib/nvmf/fc_ls.c b/lib/nvmf/fc_ls.c
index 2d9238fc1..79827bf21 100644
--- a/lib/nvmf/fc_ls.c
+++ b/lib/nvmf/fc_ls.c
@@ -99,16 +99,15 @@ static char *validation_errors[] = {
 	"Bad Subsystem Port",
 };
 
-static inline void
-nvmf_fc_add_assoc_to_tgt_port(struct spdk_nvmf_fc_nport *tgtport,
-			      struct spdk_nvmf_fc_association *assoc,
-			      struct spdk_nvmf_fc_remote_port_info *rport);
+static inline void nvmf_fc_add_assoc_to_tgt_port(struct spdk_nvmf_fc_nport *tgtport,
+		struct spdk_nvmf_fc_association *assoc,
+		struct spdk_nvmf_fc_remote_port_info *rport);
 
-static void
-nvmf_fc_del_connection(struct spdk_nvmf_fc_association *assoc,
-		       struct spdk_nvmf_fc_conn *fc_conn);
+static void nvmf_fc_del_connection(struct spdk_nvmf_fc_association *assoc,
+				   struct spdk_nvmf_fc_conn *fc_conn);
 
-static inline FCNVME_BE32 cpu_to_be32(uint32_t in)
+static inline FCNVME_BE32
+cpu_to_be32(uint32_t in)
 {
 	uint32_t t;
 
@@ -116,7 +115,8 @@ static inline FCNVME_BE32 cpu_to_be32(uint32_t in)
 	return (FCNVME_BE32)t;
 }
 
-static inline FCNVME_BE32 nvmf_fc_lsdesc_len(size_t sz)
+static inline FCNVME_BE32
+nvmf_fc_lsdesc_len(size_t sz)
 {
 	uint32_t t;
 
diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c
index 9f7df8c88..9dcdb445d 100644
--- a/lib/nvmf/nvmf.c
+++ b/lib/nvmf/nvmf.c
@@ -736,10 +736,11 @@ _nvmf_tgt_add_transport(struct spdk_io_channel_iter *i)
 	spdk_for_each_channel_continue(i, rc);
 }
 
-void spdk_nvmf_tgt_add_transport(struct spdk_nvmf_tgt *tgt,
-				 struct spdk_nvmf_transport *transport,
-				 spdk_nvmf_tgt_add_transport_done_fn cb_fn,
-				 void *cb_arg)
+void
+spdk_nvmf_tgt_add_transport(struct spdk_nvmf_tgt *tgt,
+			    struct spdk_nvmf_transport *transport,
+			    spdk_nvmf_tgt_add_transport_done_fn cb_fn,
+			    void *cb_arg)
 {
 	struct spdk_nvmf_tgt_add_transport_ctx *ctx;
 
diff --git a/lib/nvmf/nvmf_fc.h b/lib/nvmf/nvmf_fc.h
index af377d4c3..bcafb4aed 100644
--- a/lib/nvmf/nvmf_fc.h
+++ b/lib/nvmf/nvmf_fc.h
@@ -778,10 +778,9 @@ struct spdk_nvmf_fc_remove_hwqp_cb_args {
  *
  * \return 0 on success, non-zero on failure.
  */
-int
-nvmf_fc_main_enqueue_event(enum spdk_fc_event event_type,
-			   void *args,
-			   spdk_nvmf_fc_callback cb_func);
+int nvmf_fc_main_enqueue_event(enum spdk_fc_event event_type,
+			       void *args,
+			       spdk_nvmf_fc_callback cb_func);
 
 /*
  * dump info
diff --git a/lib/nvmf/nvmf_rpc.c b/lib/nvmf/nvmf_rpc.c
index a4e5b0d38..b8ec4b61c 100644
--- a/lib/nvmf/nvmf_rpc.c
+++ b/lib/nvmf/nvmf_rpc.c
@@ -482,7 +482,8 @@ free_rpc_delete_subsystem(struct rpc_delete_subsystem *r)
 	free(r->tgt_name);
 }
 
-static void rpc_nvmf_subsystem_destroy_complete_cb(void *cb_arg)
+static void
+rpc_nvmf_subsystem_destroy_complete_cb(void *cb_arg)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
 
diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c
index 581af3dde..0458ffa99 100644
--- a/lib/nvmf/rdma.c
+++ b/lib/nvmf/rdma.c
@@ -511,17 +511,14 @@ nvmf_rdma_qpair_compare(struct spdk_nvmf_rdma_qpair *rqpair1, struct spdk_nvmf_r
 
 RB_GENERATE_STATIC(qpairs_tree, spdk_nvmf_rdma_qpair, node, nvmf_rdma_qpair_compare);
 
-static bool
-nvmf_rdma_request_process(struct spdk_nvmf_rdma_transport *rtransport,
-			  struct spdk_nvmf_rdma_request *rdma_req);
+static bool nvmf_rdma_request_process(struct spdk_nvmf_rdma_transport *rtransport,
+				      struct spdk_nvmf_rdma_request *rdma_req);
 
-static void
-_poller_submit_sends(struct spdk_nvmf_rdma_transport *rtransport,
-		     struct spdk_nvmf_rdma_poller *rpoller);
+static void _poller_submit_sends(struct spdk_nvmf_rdma_transport *rtransport,
+				 struct spdk_nvmf_rdma_poller *rpoller);
 
-static void
-_poller_submit_recvs(struct spdk_nvmf_rdma_transport *rtransport,
-		     struct spdk_nvmf_rdma_poller *rpoller);
+static void _poller_submit_recvs(struct spdk_nvmf_rdma_transport *rtransport,
+				 struct spdk_nvmf_rdma_poller *rpoller);
 
 static inline int
 nvmf_rdma_check_ibv_state(enum ibv_qp_state state)
@@ -2385,8 +2382,7 @@ nvmf_rdma_is_rxe_device(struct spdk_nvmf_rdma_device *device)
 	       device->attr.vendor_id == SPDK_RDMA_RXE_VENDOR_ID_NEW;
 }
 
-static int
-nvmf_rdma_accept(void *ctx);
+static int nvmf_rdma_accept(void *ctx);
 
 static struct spdk_nvmf_transport *
 nvmf_rdma_create(struct spdk_nvmf_transport_opts *opts)
@@ -2742,10 +2738,9 @@ nvmf_rdma_destroy(struct spdk_nvmf_transport *transport,
 	return 0;
 }
 
-static int
-nvmf_rdma_trid_from_cm_id(struct rdma_cm_id *id,
-			  struct spdk_nvme_transport_id *trid,
-			  bool peer);
+static int nvmf_rdma_trid_from_cm_id(struct rdma_cm_id *id,
+				     struct spdk_nvme_transport_id *trid,
+				     bool peer);
 
 static int
 nvmf_rdma_listen(struct spdk_nvmf_transport *transport, const struct spdk_nvme_transport_id *trid,
@@ -3430,8 +3425,7 @@ nvmf_rdma_discover(struct spdk_nvmf_transport *transport,
 	entry->tsas.rdma.rdma_cms = SPDK_NVMF_RDMA_CMS_RDMA_CM;
 }
 
-static void
-nvmf_rdma_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group);
+static void nvmf_rdma_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group);
 
 static struct spdk_nvmf_transport_poll_group *
 nvmf_rdma_poll_group_create(struct spdk_nvmf_transport *transport,
diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c
index 4c5c90af5..7cd398660 100644
--- a/lib/nvmf/subsystem.c
+++ b/lib/nvmf/subsystem.c
@@ -1284,8 +1284,7 @@ nvmf_subsystem_ns_changed(struct spdk_nvmf_subsystem *subsystem, uint32_t nsid)
 	}
 }
 
-static uint32_t
-nvmf_ns_reservation_clear_all_registrants(struct spdk_nvmf_ns *ns);
+static uint32_t nvmf_ns_reservation_clear_all_registrants(struct spdk_nvmf_ns *ns);
 
 int
 spdk_nvmf_subsystem_remove_ns(struct spdk_nvmf_subsystem *subsystem, uint32_t nsid)
@@ -1560,10 +1559,9 @@ static struct spdk_bdev_module ns_bdev_module = {
 	.name	= "NVMe-oF Target",
 };
 
-static int
-nvmf_ns_load_reservation(const char *file, struct spdk_nvmf_reservation_info *info);
-static int
-nvmf_ns_reservation_restore(struct spdk_nvmf_ns *ns, struct spdk_nvmf_reservation_info *info);
+static int nvmf_ns_load_reservation(const char *file, struct spdk_nvmf_reservation_info *info);
+static int nvmf_ns_reservation_restore(struct spdk_nvmf_ns *ns,
+				       struct spdk_nvmf_reservation_info *info);
 
 uint32_t
 spdk_nvmf_subsystem_add_ns_ext(struct spdk_nvmf_subsystem *subsystem, const char *bdev_name,
@@ -1858,7 +1856,11 @@ spdk_nvmf_subsystem_get_nqn(const struct spdk_nvmf_subsystem *subsystem)
 	return subsystem->subnqn;
 }
 
-enum spdk_nvmf_subtype spdk_nvmf_subsystem_get_type(struct spdk_nvmf_subsystem *subsystem)
+/* We have to use the typedef in the function declaration to appease astyle. */
+typedef enum spdk_nvmf_subtype spdk_nvmf_subtype_t;
+
+spdk_nvmf_subtype_t
+spdk_nvmf_subsystem_get_type(struct spdk_nvmf_subsystem *subsystem)
 {
 	return subsystem->subtype;
 }
@@ -2124,8 +2126,7 @@ exit:
 	return rc;
 }
 
-static bool
-nvmf_ns_reservation_all_registrants_type(struct spdk_nvmf_ns *ns);
+static bool nvmf_ns_reservation_all_registrants_type(struct spdk_nvmf_ns *ns);
 
 static int
 nvmf_ns_reservation_restore(struct spdk_nvmf_ns *ns, struct spdk_nvmf_reservation_info *info)
diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c
index 162370866..a1e9e9dc8 100644
--- a/lib/nvmf/tcp.c
+++ b/lib/nvmf/tcp.c
@@ -580,8 +580,7 @@ nvmf_tcp_destroy(struct spdk_nvmf_transport *transport,
 	return 0;
 }
 
-static int
-nvmf_tcp_accept(void *ctx);
+static int nvmf_tcp_accept(void *ctx);
 
 static struct spdk_nvmf_transport *
 nvmf_tcp_create(struct spdk_nvmf_transport_opts *opts)
diff --git a/lib/nvmf/transport.c b/lib/nvmf/transport.c
index abc4b8000..48c6c391b 100644
--- a/lib/nvmf/transport.c
+++ b/lib/nvmf/transport.c
@@ -128,9 +128,10 @@ spdk_nvmf_get_transport_name(struct spdk_nvmf_transport *transport)
 	return transport->ops->name;
 }
 
-static void nvmf_transport_opts_copy(struct spdk_nvmf_transport_opts *opts,
-				     struct spdk_nvmf_transport_opts *opts_src,
-				     size_t opts_size)
+static void
+nvmf_transport_opts_copy(struct spdk_nvmf_transport_opts *opts,
+			 struct spdk_nvmf_transport_opts *opts_src,
+			 size_t opts_size)
 {
 	assert(opts);
 	assert(opts_src);
diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c
index 233a44e48..af8474b30 100644
--- a/lib/nvmf/vfio_user.c
+++ b/lib/nvmf/vfio_user.c
@@ -433,11 +433,9 @@ struct nvmf_vfio_user_transport {
 /*
  * function prototypes
  */
-static int
-nvmf_vfio_user_req_free(struct spdk_nvmf_request *req);
+static int nvmf_vfio_user_req_free(struct spdk_nvmf_request *req);
 
-static struct nvmf_vfio_user_req *
-get_nvmf_vfio_user_req(struct nvmf_vfio_user_sq *sq);
+static struct nvmf_vfio_user_req *get_nvmf_vfio_user_req(struct nvmf_vfio_user_sq *sq);
 
 /*
  * Local process virtual address of a queue.
@@ -1424,8 +1422,7 @@ set_sq_eventidx(struct nvmf_vfio_user_sq *sq)
 	return false;
 }
 
-static int
-nvmf_vfio_user_sq_poll(struct nvmf_vfio_user_sq *sq);
+static int nvmf_vfio_user_sq_poll(struct nvmf_vfio_user_sq *sq);
 
 /*
  * Arrange for an SQ to interrupt us if written. Returns non-zero if we
@@ -1587,9 +1584,8 @@ vfio_user_map_cmd(struct nvmf_vfio_user_ctrlr *ctrlr, struct spdk_nvmf_request *
 			    length, 4096, _map_one);
 }
 
-static int
-handle_cmd_req(struct nvmf_vfio_user_ctrlr *ctrlr, struct spdk_nvme_cmd *cmd,
-	       struct nvmf_vfio_user_sq *sq);
+static int handle_cmd_req(struct nvmf_vfio_user_ctrlr *ctrlr, struct spdk_nvme_cmd *cmd,
+			  struct nvmf_vfio_user_sq *sq);
 
 /*
  * Posts a CQE in the completion queue.
@@ -2908,8 +2904,7 @@ struct ctrlr_quiesce_ctx {
 	int status;
 };
 
-static void
-ctrlr_quiesce(struct nvmf_vfio_user_ctrlr *vu_ctrlr);
+static void ctrlr_quiesce(struct nvmf_vfio_user_ctrlr *vu_ctrlr);
 
 static void
 _vfio_user_endpoint_resume_done_msg(void *ctx)
diff --git a/lib/reduce/reduce.c b/lib/reduce/reduce.c
index 8fbd10b0e..47ca156d3 100644
--- a/lib/reduce/reduce.c
+++ b/lib/reduce/reduce.c
@@ -1709,7 +1709,8 @@ spdk_reduce_vol_get_params(struct spdk_reduce_vol *vol)
 	return &vol->params;
 }
 
-void spdk_reduce_vol_print_info(struct spdk_reduce_vol *vol)
+void
+spdk_reduce_vol_print_info(struct spdk_reduce_vol *vol)
 {
 	uint64_t logical_map_size, num_chunks, ttl_chunk_sz;
 	uint32_t struct_size;
diff --git a/lib/scsi/scsi_pr.c b/lib/scsi/scsi_pr.c
index 24b4a9307..d6cf167b3 100644
--- a/lib/scsi/scsi_pr.c
+++ b/lib/scsi/scsi_pr.c
@@ -1013,7 +1013,8 @@ scsi2_release(struct spdk_scsi_task *task)
 	return 0;
 }
 
-int scsi2_reserve_check(struct spdk_scsi_task *task)
+int
+scsi2_reserve_check(struct spdk_scsi_task *task)
 {
 	struct spdk_scsi_lun *lun = task->lun;
 	uint8_t *cdb = task->cdb;
diff --git a/lib/sock/sock.c b/lib/sock/sock.c
index 3dab463fd..c631d681f 100644
--- a/lib/sock/sock.c
+++ b/lib/sock/sock.c
@@ -866,7 +866,8 @@ spdk_net_impl_register(struct spdk_net_impl *impl, int priority)
 	}
 }
 
-int spdk_sock_set_default_impl(const char *impl_name)
+int
+spdk_sock_set_default_impl(const char *impl_name)
 {
 	struct spdk_net_impl *impl;
 
diff --git a/lib/vhost/vhost_blk.c b/lib/vhost/vhost_blk.c
index 16ec47641..82a2e5a98 100644
--- a/lib/vhost/vhost_blk.c
+++ b/lib/vhost/vhost_blk.c
@@ -73,8 +73,8 @@ struct spdk_vhost_blk_session {
 /* forward declaration */
 static const struct spdk_vhost_dev_backend vhost_blk_device_backend;
 
-static void
-vhost_user_blk_request_finish(uint8_t status, struct spdk_vhost_blk_task *task, void *cb_arg);
+static void vhost_user_blk_request_finish(uint8_t status, struct spdk_vhost_blk_task *task,
+		void *cb_arg);
 
 static int
 vhost_user_process_blk_request(struct spdk_vhost_user_blk_task *user_task)
diff --git a/lib/vhost/vhost_internal.h b/lib/vhost/vhost_internal.h
index 8e969e922..15ae59c30 100644
--- a/lib/vhost/vhost_internal.h
+++ b/lib/vhost/vhost_internal.h
@@ -389,7 +389,8 @@ int vhost_vring_inflight_desc_to_iov(struct spdk_vhost_session *vsession, struct
 uint16_t vhost_vring_packed_desc_get_buffer_id(struct spdk_vhost_virtqueue *vq, uint16_t req_idx,
 		uint16_t *num_descs);
 
-static inline bool __attribute__((always_inline))
+static inline bool
+__attribute__((always_inline))
 vhost_dev_has_feature(struct spdk_vhost_session *vsession, unsigned feature_id)
 {
 	return vsession->negotiated_features & (1ULL << feature_id);
@@ -604,8 +605,8 @@ int virtio_blk_transport_create(const char *transport_name, const struct spdk_js
 int virtio_blk_transport_destroy(struct spdk_virtio_blk_transport *transport,
 				 spdk_vhost_fini_cb cb_fn);
 
-const struct spdk_virtio_blk_transport_ops *
-virtio_blk_get_transport_ops(const char *transport_name);
+const struct spdk_virtio_blk_transport_ops *virtio_blk_get_transport_ops(
+	const char *transport_name);
 
 
 /*
diff --git a/module/bdev/aio/bdev_aio.c b/module/bdev/aio/bdev_aio.c
index 34f4446f6..798d9966b 100644
--- a/module/bdev/aio/bdev_aio.c
+++ b/module/bdev/aio/bdev_aio.c
@@ -466,7 +466,8 @@ bdev_aio_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
 	}
 }
 
-static int _bdev_aio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
+static int
+_bdev_aio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
 {
 	switch (bdev_io->type) {
 	/* Read and write operations must be performed on buffers aligned to
@@ -491,7 +492,8 @@ static int _bdev_aio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev
 	}
 }
 
-static void bdev_aio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
+static void
+bdev_aio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
 {
 	if (_bdev_aio_submit_request(ch, bdev_io) < 0) {
 		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
@@ -594,7 +596,8 @@ static const struct spdk_bdev_fn_table aio_fn_table = {
 	.write_config_json	= bdev_aio_write_json_config,
 };
 
-static void aio_free_disk(struct file_disk *fdisk)
+static void
+aio_free_disk(struct file_disk *fdisk)
 {
 	if (fdisk == NULL) {
 		return;
diff --git a/module/bdev/crypto/vbdev_crypto.c b/module/bdev/crypto/vbdev_crypto.c
index b57f652a4..16b563b65 100644
--- a/module/bdev/crypto/vbdev_crypto.c
+++ b/module/bdev/crypto/vbdev_crypto.c
@@ -392,7 +392,8 @@ release_vbdev_dev(struct vbdev_dev *device)
 
 /* Dummy function used by DPDK to free ext attached buffers to mbufs, we free them ourselves but
  * this callback has to be here. */
-static void shinfo_free_cb(void *arg1, void *arg2)
+static void
+shinfo_free_cb(void *arg1, void *arg2)
 {
 }
 
diff --git a/module/bdev/delay/vbdev_delay.c b/module/bdev/delay/vbdev_delay.c
index 6cae105ec..c9c8eb067 100644
--- a/module/bdev/delay/vbdev_delay.c
+++ b/module/bdev/delay/vbdev_delay.c
@@ -88,8 +88,7 @@ struct delay_io_channel {
 	unsigned int rand_seed;
 };
 
-static void
-vbdev_delay_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);
+static void vbdev_delay_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);
 
 
 /* Callback for unregistering the IO device. */
diff --git a/module/bdev/gpt/vbdev_gpt.c b/module/bdev/gpt/vbdev_gpt.c
index 9dc41a1ec..b93da2893 100644
--- a/module/bdev/gpt/vbdev_gpt.c
+++ b/module/bdev/gpt/vbdev_gpt.c
@@ -144,8 +144,7 @@ vbdev_gpt_destruct(void *ctx)
 	return spdk_bdev_part_free(&gpt_disk->part);
 }
 
-static void
-_vbdev_gpt_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_io);
+static void _vbdev_gpt_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_io);
 
 static void
 vbdev_gpt_resubmit_request(void *arg)
diff --git a/module/bdev/iscsi/bdev_iscsi.c b/module/bdev/iscsi/bdev_iscsi.c
index 78ddac770..190a5c66f 100644
--- a/module/bdev/iscsi/bdev_iscsi.c
+++ b/module/bdev/iscsi/bdev_iscsi.c
@@ -534,7 +534,8 @@ bdev_iscsi_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
 			 bdev_io->u.bdev.offset_blocks);
 }
 
-static void _bdev_iscsi_submit_request(void *_bdev_io)
+static void
+_bdev_iscsi_submit_request(void *_bdev_io)
 {
 	struct spdk_bdev_io *bdev_io = _bdev_io;
 	struct bdev_iscsi_io *iscsi_io = (struct bdev_iscsi_io *)bdev_io->driver_ctx;
@@ -573,7 +574,8 @@ static void _bdev_iscsi_submit_request(void *_bdev_io)
 	}
 }
 
-static void bdev_iscsi_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_io)
+static void
+bdev_iscsi_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_io)
 {
 	struct spdk_thread *submit_td = spdk_io_channel_get_thread(_ch);
 	struct bdev_iscsi_io *iscsi_io = (struct bdev_iscsi_io *)bdev_io->driver_ctx;
diff --git a/module/bdev/malloc/bdev_malloc.c b/module/bdev/malloc/bdev_malloc.c
index 082ff4d61..6d0bd1d22 100644
--- a/module/bdev/malloc/bdev_malloc.c
+++ b/module/bdev/malloc/bdev_malloc.c
@@ -209,7 +209,8 @@ bdev_malloc_unmap(struct malloc_disk *mdisk,
 				      byte_count, 0, malloc_done, task);
 }
 
-static int _bdev_malloc_submit_request(struct malloc_channel *mch, struct spdk_bdev_io *bdev_io)
+static int
+_bdev_malloc_submit_request(struct malloc_channel *mch, struct spdk_bdev_io *bdev_io)
 {
 	uint32_t block_size = bdev_io->bdev->blocklen;
 
@@ -294,7 +295,8 @@ static int _bdev_malloc_submit_request(struct malloc_channel *mch, struct spdk_b
 	return 0;
 }
 
-static void bdev_malloc_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
+static void
+bdev_malloc_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
 {
 	struct malloc_channel *mch = spdk_io_channel_get_ctx(ch);
 
@@ -505,7 +507,8 @@ malloc_destroy_channel_cb(void *io_device, void *ctx)
 	spdk_poller_unregister(&ch->completion_poller);
 }
 
-static int bdev_malloc_initialize(void)
+static int
+bdev_malloc_initialize(void)
 {
 	/* This needs to be reset for each reinitialization of submodules.
 	 * Otherwise after enough devices or reinitializations the value gets too high.
diff --git a/module/bdev/nvme/bdev_nvme_rpc.c b/module/bdev/nvme/bdev_nvme_rpc.c
index e240a2edc..45823e976 100644
--- a/module/bdev/nvme/bdev_nvme_rpc.c
+++ b/module/bdev/nvme/bdev_nvme_rpc.c
@@ -1332,7 +1332,8 @@ static const struct spdk_json_object_decoder rpc_get_controller_health_info_deco
 	{"name", offsetof(struct rpc_get_controller_health_info, name), spdk_json_decode_string, true},
 };
 
-static void nvme_health_info_cleanup(struct spdk_nvme_health_info_context *context, bool response)
+static void
+nvme_health_info_cleanup(struct spdk_nvme_health_info_context *context, bool response)
 {
 	if (response == true) {
 		spdk_jsonrpc_send_error_response(context->request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
diff --git a/module/bdev/ocf/ctx.c b/module/bdev/ocf/ctx.c
index 5f8528cb3..fbc20dad6 100644
--- a/module/bdev/ocf/ctx.c
+++ b/module/bdev/ocf/ctx.c
@@ -259,7 +259,8 @@ vbdev_ocf_ctx_data_secure_erase(ctx_data_t *ctx_data)
 	}
 }
 
-int vbdev_ocf_queue_create(ocf_cache_t cache, ocf_queue_t *queue, const struct ocf_queue_ops *ops)
+int
+vbdev_ocf_queue_create(ocf_cache_t cache, ocf_queue_t *queue, const struct ocf_queue_ops *ops)
 {
 	int rc;
 	struct vbdev_ocf_cache_ctx *ctx = ocf_cache_get_priv(cache);
@@ -270,7 +271,8 @@ int vbdev_ocf_queue_create(ocf_cache_t cache, ocf_queue_t *queue, const struct o
 	return rc;
 }
 
-void vbdev_ocf_queue_put(ocf_queue_t queue)
+void
+vbdev_ocf_queue_put(ocf_queue_t queue)
 {
 	ocf_cache_t cache = ocf_queue_get_cache(queue);
 	struct vbdev_ocf_cache_ctx *ctx = ocf_cache_get_priv(cache);
@@ -280,7 +282,8 @@ void vbdev_ocf_queue_put(ocf_queue_t queue)
 	pthread_mutex_unlock(&ctx->lock);
 }
 
-void vbdev_ocf_cache_ctx_put(struct vbdev_ocf_cache_ctx *ctx)
+void
+vbdev_ocf_cache_ctx_put(struct vbdev_ocf_cache_ctx *ctx)
 {
 	if (env_atomic_dec_return(&ctx->refcnt) == 0) {
 		pthread_mutex_destroy(&ctx->lock);
@@ -288,7 +291,8 @@ void vbdev_ocf_cache_ctx_put(struct vbdev_ocf_cache_ctx *ctx)
 	}
 }
 
-void vbdev_ocf_cache_ctx_get(struct vbdev_ocf_cache_ctx *ctx)
+void
+vbdev_ocf_cache_ctx_get(struct vbdev_ocf_cache_ctx *ctx)
 {
 	env_atomic_inc(&ctx->refcnt);
 }
diff --git a/module/bdev/ocf/volume.h b/module/bdev/ocf/volume.h
index 7ec579619..e88089601 100644
--- a/module/bdev/ocf/volume.h
+++ b/module/bdev/ocf/volume.h
@@ -26,7 +26,8 @@ struct ocf_io_ctx {
 int vbdev_ocf_volume_init(void);
 void vbdev_ocf_volume_cleanup(void);
 
-static inline struct ocf_io_ctx *ocf_get_io_ctx(struct ocf_io *io)
+static inline struct ocf_io_ctx *
+ocf_get_io_ctx(struct ocf_io *io)
 {
 	return ocf_io_get_priv(io);
 }
diff --git a/module/bdev/passthru/vbdev_passthru.c b/module/bdev/passthru/vbdev_passthru.c
index c52ea7403..50990f5eb 100644
--- a/module/bdev/passthru/vbdev_passthru.c
+++ b/module/bdev/passthru/vbdev_passthru.c
@@ -83,8 +83,7 @@ struct passthru_bdev_io {
 	struct spdk_bdev_io_wait_entry bdev_io_wait;
 };
 
-static void
-vbdev_passthru_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);
+static void vbdev_passthru_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);
 
 
 /* Callback for unregistering the IO device. */
diff --git a/module/bdev/raid/bdev_raid.c b/module/bdev/raid/bdev_raid.c
index bf0e61c5a..0428001fa 100644
--- a/module/bdev/raid/bdev_raid.c
+++ b/module/bdev/raid/bdev_raid.c
@@ -40,7 +40,8 @@ struct raid_offline_tailq	g_raid_bdev_offline_list = TAILQ_HEAD_INITIALIZER(
 
 static TAILQ_HEAD(, raid_bdev_module) g_raid_modules = TAILQ_HEAD_INITIALIZER(g_raid_modules);
 
-static struct raid_bdev_module *raid_bdev_module_find(enum raid_level level)
+static struct raid_bdev_module *
+raid_bdev_module_find(enum raid_level level)
 {
 	struct raid_bdev_module *raid_module;
 
@@ -53,7 +54,8 @@ static struct raid_bdev_module *raid_bdev_module_find(enum raid_level level)
 	return NULL;
 }
 
-void raid_bdev_module_list_add(struct raid_bdev_module *raid_module)
+void
+raid_bdev_module_list_add(struct raid_bdev_module *raid_module)
 {
 	if (raid_bdev_module_find(raid_module->level) != NULL) {
 		SPDK_ERRLOG("module for raid level '%s' already registered.\n",
@@ -359,8 +361,7 @@ raid_base_bdev_reset_complete(struct spdk_bdev_io *bdev_io, bool success, void *
 				   SPDK_BDEV_IO_STATUS_FAILED);
 }
 
-static void
-raid_bdev_submit_reset_request(struct raid_bdev_io *raid_io);
+static void raid_bdev_submit_reset_request(struct raid_bdev_io *raid_io);
 
 static void
 _raid_bdev_submit_reset_request(void *_raid_io)
@@ -884,7 +885,11 @@ static struct {
 	{ }
 };
 
-enum raid_level raid_bdev_parse_raid_level(const char *str)
+/* We have to use the typedef in the function declaration to appease astyle. */
+typedef enum raid_level raid_level_t;
+
+raid_level_t
+raid_bdev_parse_raid_level(const char *str)
 {
 	unsigned int i;
 
diff --git a/module/bdev/raid/bdev_raid.h b/module/bdev/raid/bdev_raid.h
index 5829d9710..db1efdc51 100644
--- a/module/bdev/raid/bdev_raid.h
+++ b/module/bdev/raid/bdev_raid.h
@@ -280,13 +280,10 @@ __RAID_MODULE_REGISTER(__LINE__)(void)					\
     raid_bdev_module_list_add(_module);					\
 }
 
-bool
-raid_bdev_io_complete_part(struct raid_bdev_io *raid_io, uint64_t completed,
-			   enum spdk_bdev_io_status status);
-void
-raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bdev,
-			struct spdk_io_channel *ch, spdk_bdev_io_wait_cb cb_fn);
-void
-raid_bdev_io_complete(struct raid_bdev_io *raid_io, enum spdk_bdev_io_status status);
+bool raid_bdev_io_complete_part(struct raid_bdev_io *raid_io, uint64_t completed,
+				enum spdk_bdev_io_status status);
+void raid_bdev_queue_io_wait(struct raid_bdev_io *raid_io, struct spdk_bdev *bdev,
+			     struct spdk_io_channel *ch, spdk_bdev_io_wait_cb cb_fn);
+void raid_bdev_io_complete(struct raid_bdev_io *raid_io, enum spdk_bdev_io_status status);
 
 #endif /* SPDK_BDEV_RAID_INTERNAL_H */
diff --git a/module/bdev/raid/concat.c b/module/bdev/raid/concat.c
index 228b95b15..bdd9083e5 100644
--- a/module/bdev/raid/concat.c
+++ b/module/bdev/raid/concat.c
@@ -42,8 +42,7 @@ concat_bdev_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_a
 	}
 }
 
-static void
-concat_submit_rw_request(struct raid_bdev_io *raid_io);
+static void concat_submit_rw_request(struct raid_bdev_io *raid_io);
 
 static void
 _concat_submit_rw_request(void *_raid_io)
@@ -127,8 +126,7 @@ concat_submit_rw_request(struct raid_bdev_io *raid_io)
 	}
 }
 
-static void
-concat_submit_null_payload_request(struct raid_bdev_io *raid_io);
+static void concat_submit_null_payload_request(struct raid_bdev_io *raid_io);
 
 static void
 _concat_submit_null_payload_request(void *_raid_io)
@@ -265,7 +263,8 @@ concat_submit_null_payload_request(struct raid_bdev_io *raid_io)
 	}
 }
 
-static int concat_start(struct raid_bdev *raid_bdev)
+static int
+concat_start(struct raid_bdev *raid_bdev)
 {
 	uint64_t total_blockcnt = 0;
 	struct raid_base_bdev_info *base_info;
diff --git a/module/bdev/raid/raid0.c b/module/bdev/raid/raid0.c
index 31288c003..a67d6fdec 100644
--- a/module/bdev/raid/raid0.c
+++ b/module/bdev/raid/raid0.c
@@ -38,8 +38,7 @@ raid0_bdev_io_completion(struct spdk_bdev_io *bdev_io, bool success, void *cb_ar
 	}
 }
 
-static void
-raid0_submit_rw_request(struct raid_bdev_io *raid_io);
+static void raid0_submit_rw_request(struct raid_bdev_io *raid_io);
 
 static void
 _raid0_submit_rw_request(void *_raid_io)
@@ -225,8 +224,7 @@ _raid0_split_io_range(struct raid_bdev_io_range *io_range, uint8_t disk_idx,
 	*_nblocks_in_disk = nblocks_in_disk;
 }
 
-static void
-raid0_submit_null_payload_request(struct raid_bdev_io *raid_io);
+static void raid0_submit_null_payload_request(struct raid_bdev_io *raid_io);
 
 static void
 _raid0_submit_null_payload_request(void *_raid_io)
@@ -328,7 +326,8 @@ raid0_submit_null_payload_request(struct raid_bdev_io *raid_io)
 	}
 }
 
-static int raid0_start(struct raid_bdev *raid_bdev)
+static int
+raid0_start(struct raid_bdev *raid_bdev)
 {
 	uint64_t min_blockcnt = UINT64_MAX;
 	struct raid_base_bdev_info *base_info;
diff --git a/module/bdev/split/vbdev_split.c b/module/bdev/split/vbdev_split.c
index 00901caf7..1da9667c4 100644
--- a/module/bdev/split/vbdev_split.c
+++ b/module/bdev/split/vbdev_split.c
@@ -53,8 +53,7 @@ static void vbdev_split_examine(struct spdk_bdev *bdev);
 static int vbdev_split_config_json(struct spdk_json_write_ctx *w);
 static int vbdev_split_get_ctx_size(void);
 
-static void
-_vbdev_split_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_io);
+static void _vbdev_split_submit_request(struct spdk_io_channel *_ch, struct spdk_bdev_io *bdev_io);
 
 static struct spdk_bdev_module split_if = {
 	.name = "split",
diff --git a/module/bdev/uring/bdev_uring.c b/module/bdev/uring/bdev_uring.c
index e28db8ed7..2a97f4c3c 100644
--- a/module/bdev/uring/bdev_uring.c
+++ b/module/bdev/uring/bdev_uring.c
@@ -239,8 +239,9 @@ bdev_uring_group_poll(void *arg)
 	}
 }
 
-static void bdev_uring_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
-				  bool success)
+static void
+bdev_uring_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
+		      bool success)
 {
 	if (!success) {
 		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
@@ -272,7 +273,8 @@ static void bdev_uring_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_i
 	}
 }
 
-static int _bdev_uring_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
+static int
+_bdev_uring_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
 {
 	switch (bdev_io->type) {
 	/* Read and write operations must be performed on buffers aligned to
@@ -288,7 +290,8 @@ static int _bdev_uring_submit_request(struct spdk_io_channel *ch, struct spdk_bd
 	}
 }
 
-static void bdev_uring_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
+static void
+bdev_uring_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
 {
 	if (_bdev_uring_submit_request(ch, bdev_io) < 0) {
 		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
@@ -374,7 +377,8 @@ static const struct spdk_bdev_fn_table uring_fn_table = {
 	.write_config_json	= bdev_uring_write_json_config,
 };
 
-static void uring_free_bdev(struct bdev_uring *uring)
+static void
+uring_free_bdev(struct bdev_uring *uring)
 {
 	if (uring == NULL) {
 		return;
diff --git a/module/bdev/virtio/bdev_virtio.h b/module/bdev/virtio/bdev_virtio.h
index 35e3c60f9..f95c3c0b8 100644
--- a/module/bdev/virtio/bdev_virtio.h
+++ b/module/bdev/virtio/bdev_virtio.h
@@ -142,7 +142,6 @@ struct spdk_bdev *bdev_virtio_pci_blk_dev_create(const char *name,
  * \param period_us The period time of the hotplug monitor in us
  * \return 0 for success otherwise failure
  */
-int
-bdev_virtio_pci_blk_set_hotplug(bool enabled, uint64_t period_us);
+int bdev_virtio_pci_blk_set_hotplug(bool enabled, uint64_t period_us);
 
 #endif /* SPDK_BDEV_VIRTIO_H */
diff --git a/module/bdev/virtio/bdev_virtio_scsi.c b/module/bdev/virtio/bdev_virtio_scsi.c
index 720464260..ee1e2d8a4 100644
--- a/module/bdev/virtio/bdev_virtio_scsi.c
+++ b/module/bdev/virtio/bdev_virtio_scsi.c
@@ -614,7 +614,8 @@ bdev_virtio_get_buf_cb(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io,
 	bdev_virtio_rw(ch, bdev_io);
 }
 
-static int _bdev_virtio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
+static int
+_bdev_virtio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
 {
 	struct virtio_scsi_disk *disk = SPDK_CONTAINEROF(bdev_io->bdev, struct virtio_scsi_disk, bdev);
 
@@ -653,7 +654,8 @@ static int _bdev_virtio_submit_request(struct spdk_io_channel *ch, struct spdk_b
 	return 0;
 }
 
-static void bdev_virtio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
+static void
+bdev_virtio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io)
 {
 	if (_bdev_virtio_submit_request(ch, bdev_io) < 0) {
 		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
diff --git a/module/event/subsystems/nvmf/nvmf_rpc.c b/module/event/subsystems/nvmf/nvmf_rpc.c
index f3afb7cf3..7e11abc5f 100644
--- a/module/event/subsystems/nvmf/nvmf_rpc.c
+++ b/module/event/subsystems/nvmf/nvmf_rpc.c
@@ -48,7 +48,8 @@ static const struct spdk_json_object_decoder admin_passthru_decoder[] = {
 	{"identify_ctrlr", offsetof(struct spdk_nvmf_admin_passthru_conf, identify_ctrlr), spdk_json_decode_bool}
 };
 
-static int decode_admin_passthru(const struct spdk_json_val *val, void *out)
+static int
+decode_admin_passthru(const struct spdk_json_val *val, void *out)
 {
 	struct spdk_nvmf_admin_passthru_conf *req = (struct spdk_nvmf_admin_passthru_conf *)out;
 
diff --git a/scripts/check_format.sh b/scripts/check_format.sh
index 6b20f7eae..f2cf75273 100755
--- a/scripts/check_format.sh
+++ b/scripts/check_format.sh
@@ -132,7 +132,7 @@ function check_c_style() {
 			#  coding standards.
 			git ls-files '*.[ch]' \
 				| grep -v rte_vhost | grep -v cpp_headers \
-				| xargs -P$(nproc) -n10 astyle \
+				| xargs -P$(nproc) -n10 astyle --break-return-type --attach-return-type-decl \
 					--options=.astylerc >> astyle.log
 			git ls-files '*.cpp' '*.cc' '*.cxx' '*.hh' '*.hpp' \
 				| grep -v rte_vhost | grep -v cpp_headers \
diff --git a/test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c b/test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c
index 215277bdd..c8a919784 100644
--- a/test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c
+++ b/test/app/fuzz/llvm_nvme_fuzz/llvm_nvme_fuzz.c
@@ -267,7 +267,8 @@ fuzz_admin_directive_receive_command(struct fuzz_command *cmd)
 	g_data += 8;
 }
 
-static void feat_arbitration(struct fuzz_command *cmd)
+static void
+feat_arbitration(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_arbitration.bits.hpw = g_data[2];
 	cmd->cmd.cdw11_bits.feat_arbitration.bits.mpw = g_data[3];
@@ -275,18 +276,21 @@ static void feat_arbitration(struct fuzz_command *cmd)
 	cmd->cmd.cdw11_bits.feat_arbitration.bits.ab = g_data[5] & 0x07;
 }
 
-static void feat_power_management(struct fuzz_command *cmd)
+static void
+feat_power_management(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_power_management.bits.wh = g_data[2] & 0x07;
 	cmd->cmd.cdw11_bits.feat_power_management.bits.ps = (g_data[2] >> 3) & 0x1f;
 }
 
-static void feat_lba_range_type(struct fuzz_command *cmd)
+static void
+feat_lba_range_type(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_lba_range_type.bits.num = (g_data[2] >> 2) & 0x3f;
 }
 
-static void feat_temperature_threshold(struct fuzz_command *cmd)
+static void
+feat_temperature_threshold(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_temp_threshold.bits.thsel = g_data[2] & 0x03;
 	cmd->cmd.cdw11_bits.feat_temp_threshold.bits.tmpsel = (g_data[2] >> 2) & 0x0f;
@@ -294,43 +298,50 @@ static void feat_temperature_threshold(struct fuzz_command *cmd)
 			(uint16_t)g_data[4];
 }
 
-static void feat_error_recover(struct fuzz_command *cmd)
+static void
+feat_error_recover(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_error_recovery.bits.dulbe = g_data[2] & 0x01;
 	cmd->cmd.cdw11_bits.feat_error_recovery.bits.tler = ((uint16_t)g_data[3] << 8) +
 			(uint16_t)g_data[4];
 }
 
-static void feat_volatile_write_cache(struct fuzz_command *cmd)
+static void
+feat_volatile_write_cache(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_volatile_write_cache.bits.wce = g_data[2] & 0x01;
 }
 
-static void feat_number_of_queues(struct fuzz_command *cmd)
+static void
+feat_number_of_queues(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_num_of_queues.bits.ncqr = ((uint16_t)g_data[2] << 8) + (uint16_t)g_data[3];
 	cmd->cmd.cdw11_bits.feat_num_of_queues.bits.nsqr = ((uint16_t)g_data[4] << 8) + (uint16_t)g_data[5];
 }
 
-static void feat_interrupt_coalescing(struct fuzz_command *cmd)
+static void
+feat_interrupt_coalescing(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_interrupt_coalescing.bits.time = g_data[2];
 	cmd->cmd.cdw11_bits.feat_interrupt_coalescing.bits.thr = g_data[3];
 }
 
-static void feat_interrupt_vector_configuration(struct fuzz_command *cmd)
+static void
+feat_interrupt_vector_configuration(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_interrupt_vector_configuration.bits.cd = g_data[2] & 0x01;
 	cmd->cmd.cdw11_bits.feat_interrupt_vector_configuration.bits.iv = ((uint16_t)g_data[3] << 8) +
 			(uint16_t)g_data[4];
 }
 
-static void feat_write_atomicity(struct fuzz_command *cmd)
+static void
+feat_write_atomicity(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_write_atomicity.bits.dn = g_data[2] & 0x01;
 }
 
-static void feat_async_event_cfg(struct fuzz_command *cmd)
+static void
+feat_async_event_cfg(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_async_event_cfg.bits.ana_change_notice = g_data[2] & 0x01;
 	cmd->cmd.cdw11_bits.feat_async_event_cfg.bits.discovery_log_change_notice = (g_data[2] >> 1) & 0x01;
@@ -347,26 +358,30 @@ static void feat_async_event_cfg(struct fuzz_command *cmd)
 		(g_data[3] >> 4) & 0x01;
 }
 
-static void feat_keep_alive_timer(struct fuzz_command *cmd)
+static void
+feat_keep_alive_timer(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_keep_alive_timer.bits.kato = ((uint32_t)g_data[2] << 24) + ((
 				uint32_t)g_data[3] << 16) +
 			((uint32_t)g_data[4] << 8) + (uint32_t)g_data[5];
 }
 
-static void feat_host_identifier(struct fuzz_command *cmd)
+static void
+feat_host_identifier(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_host_identifier.bits.exhid = g_data[2] & 0x01;
 }
 
-static void feat_rsv_notification_mask(struct fuzz_command *cmd)
+static void
+feat_rsv_notification_mask(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_rsv_notification_mask.bits.regpre = g_data[2] & 0x01;
 	cmd->cmd.cdw11_bits.feat_rsv_notification_mask.bits.respre = (g_data[2] >> 1) & 0x01;
 	cmd->cmd.cdw11_bits.feat_rsv_notification_mask.bits.resrel = (g_data[2] >> 2) & 0x01;
 }
 
-static void feat_rsv_persistence(struct fuzz_command *cmd)
+static void
+feat_rsv_persistence(struct fuzz_command *cmd)
 {
 	cmd->cmd.cdw11_bits.feat_rsv_persistence.bits.ptpl = g_data[2] & 0x01;
 }
@@ -759,7 +774,8 @@ run_cmds(uint32_t queue_depth)
 	return 0;
 }
 
-static int TestOneInput(const uint8_t *data, size_t size)
+static int
+TestOneInput(const uint8_t *data, size_t size)
 {
 	struct spdk_nvme_detach_ctx *detach_ctx = NULL;
 
@@ -791,7 +807,8 @@ static int TestOneInput(const uint8_t *data, size_t size)
 
 int LLVMFuzzerRunDriver(int *argc, char ***argv, int (*UserCb)(const uint8_t *Data, size_t Size));
 
-static void exit_handler(void)
+static void
+exit_handler(void)
 {
 	if (g_in_fuzzer) {
 		spdk_app_stop(0);
diff --git a/test/blobfs/fuse/fuse.c b/test/blobfs/fuse/fuse.c
index a84184613..77d075746 100644
--- a/test/blobfs/fuse/fuse.c
+++ b/test/blobfs/fuse/fuse.c
@@ -54,7 +54,8 @@ spdk_fuse_shutdown(void)
 	spdk_app_stop(0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct spdk_app_opts opts = {};
 	int rc = 0;
diff --git a/test/blobfs/mkfs/mkfs.c b/test/blobfs/mkfs/mkfs.c
index 2df4951cf..1137ae8ed 100644
--- a/test/blobfs/mkfs/mkfs.c
+++ b/test/blobfs/mkfs/mkfs.c
@@ -56,7 +56,8 @@ mkfs_parse_arg(int ch, char *arg)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct spdk_app_opts opts = {};
 	int rc = 0;
diff --git a/test/dma/test_dma/test_dma.c b/test/dma/test_dma/test_dma.c
index a308aa0b9..115a4602a 100644
--- a/test/dma/test_dma/test_dma.c
+++ b/test/dma/test_dma/test_dma.c
@@ -290,29 +290,32 @@ dma_test_copy_memory(struct dma_test_req *req, struct iovec *dst_iov, uint32_t d
 	return 0;
 }
 
-static int dma_test_push_memory_cb(struct spdk_memory_domain *dst_domain,
-				   void *dst_domain_ctx,
-				   struct iovec *dst_iov, uint32_t dst_iovcnt, struct iovec *src_iov, uint32_t src_iovcnt,
-				   spdk_memory_domain_data_cpl_cb cpl_cb, void *cpl_cb_arg)
+static int
+dma_test_push_memory_cb(struct spdk_memory_domain *dst_domain,
+			void *dst_domain_ctx,
+			struct iovec *dst_iov, uint32_t dst_iovcnt, struct iovec *src_iov, uint32_t src_iovcnt,
+			spdk_memory_domain_data_cpl_cb cpl_cb, void *cpl_cb_arg)
 {
 	struct dma_test_req *req = dst_domain_ctx;
 
 	return dma_test_copy_memory(req, dst_iov, dst_iovcnt, src_iov, src_iovcnt, cpl_cb, cpl_cb_arg);
 }
 
-static int dma_test_pull_memory_cb(struct spdk_memory_domain *src_domain,
-				   void *src_domain_ctx,
-				   struct iovec *src_iov, uint32_t src_iovcnt, struct iovec *dst_iov, uint32_t dst_iovcnt,
-				   spdk_memory_domain_data_cpl_cb cpl_cb, void *cpl_cb_arg)
+static int
+dma_test_pull_memory_cb(struct spdk_memory_domain *src_domain,
+			void *src_domain_ctx,
+			struct iovec *src_iov, uint32_t src_iovcnt, struct iovec *dst_iov, uint32_t dst_iovcnt,
+			spdk_memory_domain_data_cpl_cb cpl_cb, void *cpl_cb_arg)
 {
 	struct dma_test_req *req = src_domain_ctx;
 
 	return dma_test_copy_memory(req, dst_iov, dst_iovcnt, src_iov, src_iovcnt, cpl_cb, cpl_cb_arg);
 }
 
-static int dma_test_memzero_cb(struct spdk_memory_domain *src_domain, void *src_domain_ctx,
-			       struct iovec *iov, uint32_t iovcnt,
-			       spdk_memory_domain_data_cpl_cb cpl_cb, void *cpl_cb_arg)
+static int
+dma_test_memzero_cb(struct spdk_memory_domain *src_domain, void *src_domain_ctx,
+		    struct iovec *iov, uint32_t iovcnt,
+		    spdk_memory_domain_data_cpl_cb cpl_cb, void *cpl_cb_arg)
 {
 	struct dma_test_req *req = src_domain_ctx;
 	struct dma_test_data_cpl_ctx *cpl_ctx;
@@ -420,7 +423,8 @@ dma_test_bdev_dummy_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *b
 {
 }
 
-static void dma_test_task_run(void *ctx)
+static void
+dma_test_task_run(void *ctx)
 {
 	struct dma_test_task *task = ctx;
 	uint32_t i;
diff --git a/test/env/pci/pci_ut.c b/test/env/pci/pci_ut.c
index b4ff014e3..8ebb317f0 100644
--- a/test/env/pci/pci_ut.c
+++ b/test/env/pci/pci_ut.c
@@ -76,7 +76,8 @@ ut_cfg_read(struct spdk_pci_device *dev, void *value, uint32_t len, uint32_t off
 	return 0;
 }
 
-static int ut_cfg_write(struct spdk_pci_device *dev, void *value, uint32_t len, uint32_t offset)
+static int
+ut_cfg_write(struct spdk_pci_device *dev, void *value, uint32_t len, uint32_t offset)
 {
 	struct ut_pci_dev *ut_dev = (struct ut_pci_dev *)dev;
 
@@ -180,7 +181,8 @@ pci_hook_test(void)
 	CU_ASSERT(rc != 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/event/app_repeat/app_repeat.c b/test/event/app_repeat/app_repeat.c
index f5d205ea4..50359e715 100644
--- a/test/event/app_repeat/app_repeat.c
+++ b/test/event/app_repeat/app_repeat.c
@@ -43,7 +43,8 @@ app_repeat_started(void *arg1)
 	printf("spdk_app_start is called in Round %d.\n", index);
 }
 
-static void _app_repeat_shutdown_cb(void)
+static void
+_app_repeat_shutdown_cb(void)
 {
 	printf("Shutdown signal received, stop current app iteration\n");
 	spdk_app_stop(0);
diff --git a/test/external_code/passthru/vbdev_passthru.c b/test/external_code/passthru/vbdev_passthru.c
index 653b96710..ad6db1859 100644
--- a/test/external_code/passthru/vbdev_passthru.c
+++ b/test/external_code/passthru/vbdev_passthru.c
@@ -82,8 +82,7 @@ struct passthru_bdev_io {
 	struct spdk_bdev_io_wait_entry bdev_io_wait;
 };
 
-static void
-vbdev_passthru_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);
+static void vbdev_passthru_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);
 
 
 /* Callback for unregistering the IO device. */
diff --git a/test/nvme/aer/aer.c b/test/nvme/aer/aer.c
index a988bf848..d2a29edb1 100644
--- a/test/nvme/aer/aer.c
+++ b/test/nvme/aer/aer.c
@@ -555,7 +555,8 @@ setup_multi_process(void)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct dev		*dev;
 	struct spdk_env_opts	opts;
diff --git a/test/nvme/boot_partition/boot_partition.c b/test/nvme/boot_partition/boot_partition.c
index 2f0735816..5bfe5b0a9 100644
--- a/test/nvme/boot_partition/boot_partition.c
+++ b/test/nvme/boot_partition/boot_partition.c
@@ -227,7 +227,8 @@ parse_args(int argc, char **argv)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int			rc;
 	struct spdk_env_opts	opts;
diff --git a/test/nvme/compliance/nvme_compliance.c b/test/nvme/compliance/nvme_compliance.c
index 183e21eb8..650b9213b 100644
--- a/test/nvme/compliance/nvme_compliance.c
+++ b/test/nvme/compliance/nvme_compliance.c
@@ -1427,7 +1427,8 @@ admin_create_io_sq_shared_cq(void)
 	spdk_nvme_detach(ctrlr);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct spdk_env_opts	opts;
 	CU_pSuite		suite = NULL;
diff --git a/test/nvme/connect_stress/connect_stress.c b/test/nvme/connect_stress/connect_stress.c
index a61d4db75..d65d3f5dd 100644
--- a/test/nvme/connect_stress/connect_stress.c
+++ b/test/nvme/connect_stress/connect_stress.c
@@ -17,7 +17,8 @@ static int g_time_in_sec;
 
 static struct spdk_nvme_transport_id g_trid;
 
-static void usage(char *program_name)
+static void
+usage(char *program_name)
 {
 	printf("%s options", program_name);
 	printf("\n");
@@ -236,7 +237,8 @@ test_controller(void)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct spdk_env_opts opts;
 	uint64_t tsc_end;
diff --git a/test/nvme/cuse/cuse.c b/test/nvme/cuse/cuse.c
index c5ae3802e..e943db03b 100644
--- a/test/nvme/cuse/cuse.c
+++ b/test/nvme/cuse/cuse.c
@@ -181,7 +181,8 @@ test_cuse_update(void)
 	nvme_cuse_stop(&ctrlr);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/nvme/deallocated_value/deallocated_value.c b/test/nvme/deallocated_value/deallocated_value.c
index a303e09b0..318c163bf 100644
--- a/test/nvme/deallocated_value/deallocated_value.c
+++ b/test/nvme/deallocated_value/deallocated_value.c
@@ -462,7 +462,8 @@ cleanup(struct deallocate_context *context)
 	free(context->FFh_buf);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int			rc;
 	struct spdk_env_opts	opts;
diff --git a/test/nvme/e2edp/nvme_dp.c b/test/nvme/e2edp/nvme_dp.c
index 371db25b6..53c2b46c9 100644
--- a/test/nvme/e2edp/nvme_dp.c
+++ b/test/nvme/e2edp/nvme_dp.c
@@ -77,7 +77,8 @@ ns_data_buffer_reset(struct spdk_nvme_ns *ns, struct io_request *req, uint8_t da
 	}
 }
 
-static void nvme_req_reset_sgl(void *cb_arg, uint32_t sgl_offset)
+static void
+nvme_req_reset_sgl(void *cb_arg, uint32_t sgl_offset)
 {
 	struct io_request *req = (struct io_request *)cb_arg;
 
@@ -85,7 +86,8 @@ static void nvme_req_reset_sgl(void *cb_arg, uint32_t sgl_offset)
 	return;
 }
 
-static int nvme_req_next_sge(void *cb_arg, void **address, uint32_t *length)
+static int
+nvme_req_next_sge(void *cb_arg, void **address, uint32_t *length)
 {
 	struct io_request *req = (struct io_request *)cb_arg;
 	void *payload;
@@ -99,8 +101,9 @@ static int nvme_req_next_sge(void *cb_arg, void **address, uint32_t *length)
 }
 
 /* CRC-16 Guard checked for extended lba format */
-static uint32_t dp_guard_check_extended_lba_test(struct spdk_nvme_ns *ns, struct io_request *req,
-		uint32_t *io_flags)
+static uint32_t
+dp_guard_check_extended_lba_test(struct spdk_nvme_ns *ns, struct io_request *req,
+				 uint32_t *io_flags)
 {
 	struct spdk_nvme_protection_info *pi;
 	uint32_t md_size, sector_size, chksum_size;
@@ -142,8 +145,9 @@ static uint32_t dp_guard_check_extended_lba_test(struct spdk_nvme_ns *ns, struct
  *  both extended LBA format and separate metadata can
  *  run the test case.
  */
-static uint32_t dp_with_pract_test(struct spdk_nvme_ns *ns, struct io_request *req,
-				   uint32_t *io_flags)
+static uint32_t
+dp_with_pract_test(struct spdk_nvme_ns *ns, struct io_request *req,
+		   uint32_t *io_flags)
 {
 	uint32_t md_size, sector_size, data_len;
 
@@ -187,8 +191,9 @@ static uint32_t dp_with_pract_test(struct spdk_nvme_ns *ns, struct io_request *r
 }
 
 /* Block Reference Tag checked for TYPE1 and TYPE2 with PRACT setting to 0 */
-static uint32_t dp_without_pract_extended_lba_test(struct spdk_nvme_ns *ns, struct io_request *req,
-		uint32_t *io_flags)
+static uint32_t
+dp_without_pract_extended_lba_test(struct spdk_nvme_ns *ns, struct io_request *req,
+				   uint32_t *io_flags)
 {
 	struct spdk_nvme_protection_info *pi;
 	uint32_t md_size, sector_size;
@@ -230,8 +235,9 @@ static uint32_t dp_without_pract_extended_lba_test(struct spdk_nvme_ns *ns, stru
 }
 
 /* LBA + Metadata without data protection bits setting */
-static uint32_t dp_without_flags_extended_lba_test(struct spdk_nvme_ns *ns, struct io_request *req,
-		uint32_t *io_flags)
+static uint32_t
+dp_without_flags_extended_lba_test(struct spdk_nvme_ns *ns, struct io_request *req,
+				   uint32_t *io_flags)
 {
 	uint32_t md_size, sector_size;
 
@@ -257,8 +263,9 @@ static uint32_t dp_without_flags_extended_lba_test(struct spdk_nvme_ns *ns, stru
 }
 
 /* Block Reference Tag checked for TYPE1 and TYPE2 with PRACT setting to 0 */
-static uint32_t dp_without_pract_separate_meta_test(struct spdk_nvme_ns *ns, struct io_request *req,
-		uint32_t *io_flags)
+static uint32_t
+dp_without_pract_separate_meta_test(struct spdk_nvme_ns *ns, struct io_request *req,
+				    uint32_t *io_flags)
 {
 	struct spdk_nvme_protection_info *pi;
 	uint32_t md_size, sector_size;
@@ -305,7 +312,8 @@ static uint32_t dp_without_pract_separate_meta_test(struct spdk_nvme_ns *ns, str
 }
 
 /* Application Tag checked with PRACT setting to 0 */
-static uint32_t dp_without_pract_separate_meta_apptag_test(struct spdk_nvme_ns *ns,
+static uint32_t
+dp_without_pract_separate_meta_apptag_test(struct spdk_nvme_ns *ns,
 		struct io_request *req,
 		uint32_t *io_flags)
 {
@@ -347,8 +355,9 @@ static uint32_t dp_without_pract_separate_meta_apptag_test(struct spdk_nvme_ns *
  * LBA + Metadata without data protection bits setting,
  *  separate metadata payload for the test case.
  */
-static uint32_t dp_without_flags_separate_meta_test(struct spdk_nvme_ns *ns, struct io_request *req,
-		uint32_t *io_flags)
+static uint32_t
+dp_without_flags_separate_meta_test(struct spdk_nvme_ns *ns, struct io_request *req,
+				    uint32_t *io_flags)
 {
 	uint32_t md_size, sector_size;
 
@@ -576,7 +585,8 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 	printf("Attached to %s\n", dev->name);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct dev		*iter;
 	int			rc;
diff --git a/test/nvme/err_injection/err_injection.c b/test/nvme/err_injection/err_injection.c
index f7ae3012b..592c56fbf 100644
--- a/test/nvme/err_injection/err_injection.c
+++ b/test/nvme/err_injection/err_injection.c
@@ -182,7 +182,8 @@ cleanup:
 	}
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct dev		*dev;
 	struct spdk_env_opts	opts;
diff --git a/test/nvme/fused_ordering/fused_ordering.c b/test/nvme/fused_ordering/fused_ordering.c
index 11778f768..b4de0f994 100644
--- a/test/nvme/fused_ordering/fused_ordering.c
+++ b/test/nvme/fused_ordering/fused_ordering.c
@@ -150,7 +150,8 @@ parse_args(int argc, char **argv, struct spdk_env_opts *env_opts)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc, i;
 	struct spdk_env_opts opts;
diff --git a/test/nvme/overhead/overhead.c b/test/nvme/overhead/overhead.c
index a7a0d4539..a86b4e46c 100644
--- a/test/nvme/overhead/overhead.c
+++ b/test/nvme/overhead/overhead.c
@@ -452,7 +452,8 @@ work_fn(void)
 	return 0;
 }
 
-static void usage(char *program_name)
+static void
+usage(char *program_name)
 {
 	printf("%s options", program_name);
 #if HAVE_LIBAIO
@@ -690,7 +691,8 @@ cleanup(void)
 	}
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int			rc;
 	struct spdk_env_opts	opts;
diff --git a/test/nvme/reserve/reserve.c b/test/nvme/reserve/reserve.c
index b2d0f6e51..45cf2bfb8 100644
--- a/test/nvme/reserve/reserve.c
+++ b/test/nvme/reserve/reserve.c
@@ -389,7 +389,8 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 	dev->ctrlr = ctrlr;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct dev		*iter;
 	struct spdk_env_opts	opts;
diff --git a/test/nvme/reset/reset.c b/test/nvme/reset/reset.c
index 6b26309dd..7e3853808 100644
--- a/test/nvme/reset/reset.c
+++ b/test/nvme/reset/reset.c
@@ -287,7 +287,8 @@ work_fn(void *arg)
 	return 0;
 }
 
-static void usage(char *program_name)
+static void
+usage(char *program_name)
 {
 	printf("%s options", program_name);
 	printf("\n");
@@ -621,7 +622,8 @@ free_tasks(void)
 	spdk_mempool_free(task_pool);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int			rc;
 	int			i;
diff --git a/test/nvme/sgl/sgl.c b/test/nvme/sgl/sgl.c
index 48a69f2c5..d13c8afd5 100644
--- a/test/nvme/sgl/sgl.c
+++ b/test/nvme/sgl/sgl.c
@@ -44,7 +44,8 @@ struct io_request {
 	uint32_t misalign;
 };
 
-static void nvme_request_reset_sgl(void *cb_arg, uint32_t sgl_offset)
+static void
+nvme_request_reset_sgl(void *cb_arg, uint32_t sgl_offset)
 {
 	uint32_t i;
 	uint32_t offset = 0;
@@ -63,7 +64,8 @@ static void nvme_request_reset_sgl(void *cb_arg, uint32_t sgl_offset)
 	return;
 }
 
-static int nvme_request_next_sge(void *cb_arg, void **address, uint32_t *length)
+static int
+nvme_request_next_sge(void *cb_arg, void **address, uint32_t *length)
 {
 	struct io_request *req = (struct io_request *)cb_arg;
 	struct sgl_element *iov;
@@ -100,7 +102,8 @@ io_complete(void *ctx, const struct spdk_nvme_cpl *cpl)
 	}
 }
 
-static void build_io_request_0(struct io_request *req)
+static void
+build_io_request_0(struct io_request *req)
 {
 	req->nseg = 1;
 
@@ -108,7 +111,8 @@ static void build_io_request_0(struct io_request *req)
 	req->iovs[0].len = 0x800;
 }
 
-static void build_io_request_1(struct io_request *req)
+static void
+build_io_request_1(struct io_request *req)
 {
 	req->nseg = 1;
 
@@ -117,7 +121,8 @@ static void build_io_request_1(struct io_request *req)
 	req->iovs[0].len = 0x200;
 }
 
-static void build_io_request_2(struct io_request *req)
+static void
+build_io_request_2(struct io_request *req)
 {
 	req->nseg = 1;
 
@@ -126,7 +131,8 @@ static void build_io_request_2(struct io_request *req)
 	req->iovs[0].len = 0x40000;
 }
 
-static void build_io_request_3(struct io_request *req)
+static void
+build_io_request_3(struct io_request *req)
 {
 	req->nseg = 3;
 
@@ -145,7 +151,8 @@ static void build_io_request_3(struct io_request *req)
 	req->iovs[2].len = 0x3000;
 }
 
-static void build_io_request_4(struct io_request *req)
+static void
+build_io_request_4(struct io_request *req)
 {
 	uint32_t i;
 
@@ -162,7 +169,8 @@ static void build_io_request_4(struct io_request *req)
 	}
 }
 
-static void build_io_request_5(struct io_request *req)
+static void
+build_io_request_5(struct io_request *req)
 {
 	req->nseg = 1;
 
@@ -171,7 +179,8 @@ static void build_io_request_5(struct io_request *req)
 	req->iovs[0].len = 0x2000;
 }
 
-static void build_io_request_6(struct io_request *req)
+static void
+build_io_request_6(struct io_request *req)
 {
 	req->nseg = 2;
 
@@ -184,7 +193,8 @@ static void build_io_request_6(struct io_request *req)
 	req->iovs[1].len = 0x1000;
 }
 
-static void build_io_request_7(struct io_request *req)
+static void
+build_io_request_7(struct io_request *req)
 {
 	uint8_t *base;
 
@@ -200,7 +210,8 @@ static void build_io_request_7(struct io_request *req)
 	req->iovs[0].len = 0x10000;
 }
 
-static void build_io_request_8(struct io_request *req)
+static void
+build_io_request_8(struct io_request *req)
 {
 	req->nseg = 2;
 
@@ -221,7 +232,8 @@ static void build_io_request_8(struct io_request *req)
 	req->iovs[1].len = 0x400;
 }
 
-static void build_io_request_9(struct io_request *req)
+static void
+build_io_request_9(struct io_request *req)
 {
 	/*
 	 * Check if mixed PRP complaint and not complaint requests are handled
@@ -243,7 +255,8 @@ static void build_io_request_9(struct io_request *req)
 	}
 }
 
-static void build_io_request_10(struct io_request *req)
+static void
+build_io_request_10(struct io_request *req)
 {
 	/*
 	 * Test the case where we have a valid PRP list, but the first and last
@@ -264,7 +277,8 @@ static void build_io_request_10(struct io_request *req)
 	}
 }
 
-static void build_io_request_11(struct io_request *req)
+static void
+build_io_request_11(struct io_request *req)
 {
 	/* This test case focuses on the last element not starting on a page boundary. */
 	const size_t req_len[] = { 512, 512 };
@@ -462,7 +476,8 @@ attach_cb(void *cb_ctx, const struct spdk_nvme_transport_id *trid,
 	printf("Attached to %s\n", dev->name);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct dev		*iter;
 	int			rc;
diff --git a/test/nvme/simple_copy/simple_copy.c b/test/nvme/simple_copy/simple_copy.c
index d361ba6b1..2cc1dd771 100644
--- a/test/nvme/simple_copy/simple_copy.c
+++ b/test/nvme/simple_copy/simple_copy.c
@@ -384,7 +384,8 @@ cleanup(struct simple_copy_context *context)
 	free(context->read_bufs);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int			rc;
 	struct spdk_env_opts	opts;
diff --git a/test/nvme/startup/startup.c b/test/nvme/startup/startup.c
index c498cfd4d..daca0fa7a 100644
--- a/test/nvme/startup/startup.c
+++ b/test/nvme/startup/startup.c
@@ -122,7 +122,8 @@ parse_args(int argc, char **argv)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	int rc;
 	struct spdk_env_opts opts;
diff --git a/test/rpc_client/rpc_client_test.c b/test/rpc_client/rpc_client_test.c
index f030e894f..a5a9df577 100644
--- a/test/rpc_client/rpc_client_test.c
+++ b/test/rpc_client/rpc_client_test.c
@@ -365,7 +365,8 @@ out:
 	return (void *)(intptr_t)rc;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	pthread_t srv_tid, client_tid;
 	int srv_tid_valid;
diff --git a/test/unit/lib/accel/accel.c/accel_engine_ut.c b/test/unit/lib/accel/accel.c/accel_engine_ut.c
index 8ffc3334f..f66aa8ad5 100644
--- a/test/unit/lib/accel/accel.c/accel_engine_ut.c
+++ b/test/unit/lib/accel/accel.c/accel_engine_ut.c
@@ -513,7 +513,8 @@ test_spdk_accel_engine_register(void)
 	CU_ASSERT(i == 4);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/bdev/compress.c/compress_ut.c b/test/unit/lib/bdev/compress.c/compress_ut.c
index 9e60cd728..9334900bb 100644
--- a/test/unit/lib/bdev/compress.c/compress_ut.c
+++ b/test/unit/lib/bdev/compress.c/compress_ut.c
@@ -47,8 +47,9 @@ struct comp_io_channel *g_comp_ch;
 static void mock_rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, rte_iova_t buf_iova,
 		uint16_t buf_len, struct rte_mbuf_ext_shared_info *shinfo);
 #define rte_pktmbuf_attach_extbuf mock_rte_pktmbuf_attach_extbuf
-static void mock_rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, rte_iova_t buf_iova,
-		uint16_t buf_len, struct rte_mbuf_ext_shared_info *shinfo)
+static void
+mock_rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, rte_iova_t buf_iova,
+			       uint16_t buf_len, struct rte_mbuf_ext_shared_info *shinfo)
 {
 	assert(m != NULL);
 	m->buf_addr = buf_addr;
@@ -59,7 +60,8 @@ static void mock_rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, r
 
 static char *mock_rte_pktmbuf_append(struct rte_mbuf *m, uint16_t len);
 #define rte_pktmbuf_append mock_rte_pktmbuf_append
-static char *mock_rte_pktmbuf_append(struct rte_mbuf *m, uint16_t len)
+static char *
+mock_rte_pktmbuf_append(struct rte_mbuf *m, uint16_t len)
 {
 	m->pkt_len = m->pkt_len + len;
 	return NULL;
@@ -67,7 +69,8 @@ static char *mock_rte_pktmbuf_append(struct rte_mbuf *m, uint16_t len)
 
 static inline int mock_rte_pktmbuf_chain(struct rte_mbuf *head, struct rte_mbuf *tail);
 #define rte_pktmbuf_chain mock_rte_pktmbuf_chain
-static inline int mock_rte_pktmbuf_chain(struct rte_mbuf *head, struct rte_mbuf *tail)
+static inline int
+mock_rte_pktmbuf_chain(struct rte_mbuf *head, struct rte_mbuf *tail)
 {
 	struct rte_mbuf *cur_tail;
 
@@ -153,13 +156,15 @@ mock_rte_comp_op_pool_create(const char *name, unsigned int nb_elts,
 
 void mock_rte_pktmbuf_free(struct rte_mbuf *m);
 #define rte_pktmbuf_free mock_rte_pktmbuf_free
-void mock_rte_pktmbuf_free(struct rte_mbuf *m)
+void
+mock_rte_pktmbuf_free(struct rte_mbuf *m)
 {
 }
 
 void mock_rte_pktmbuf_free_bulk(struct rte_mbuf **m, unsigned int cnt);
 #define rte_pktmbuf_free_bulk mock_rte_pktmbuf_free_bulk
-void mock_rte_pktmbuf_free_bulk(struct rte_mbuf **m, unsigned int cnt)
+void
+mock_rte_pktmbuf_free_bulk(struct rte_mbuf **m, unsigned int cnt)
 {
 }
 
@@ -168,8 +173,9 @@ static int ut_rte_pktmbuf_alloc_bulk = 0;
 int mock_rte_pktmbuf_alloc_bulk(struct rte_mempool *pool, struct rte_mbuf **mbufs,
 				unsigned count);
 #define rte_pktmbuf_alloc_bulk mock_rte_pktmbuf_alloc_bulk
-int mock_rte_pktmbuf_alloc_bulk(struct rte_mempool *pool, struct rte_mbuf **mbufs,
-				unsigned count)
+int
+mock_rte_pktmbuf_alloc_bulk(struct rte_mempool *pool, struct rte_mbuf **mbufs,
+			    unsigned count)
 {
 	int i;
 
diff --git a/test/unit/lib/bdev/crypto.c/crypto_ut.c b/test/unit/lib/bdev/crypto.c/crypto_ut.c
index 984204be8..8fd10ab69 100644
--- a/test/unit/lib/bdev/crypto.c/crypto_ut.c
+++ b/test/unit/lib/bdev/crypto.c/crypto_ut.c
@@ -30,19 +30,22 @@ bool ut_rte_cryptodev_info_get_mocked = false;
 
 void mock_rte_pktmbuf_free_bulk(struct rte_mbuf **m, unsigned int cnt);
 #define rte_pktmbuf_free_bulk mock_rte_pktmbuf_free_bulk
-void mock_rte_pktmbuf_free_bulk(struct rte_mbuf **m, unsigned int cnt)
+void
+mock_rte_pktmbuf_free_bulk(struct rte_mbuf **m, unsigned int cnt)
 {
 	spdk_mempool_put_bulk((struct spdk_mempool *)m[0]->pool, (void **)m, cnt);
 }
 
 void mock_rte_pktmbuf_free(struct rte_mbuf *m);
 #define rte_pktmbuf_free mock_rte_pktmbuf_free
-void mock_rte_pktmbuf_free(struct rte_mbuf *m)
+void
+mock_rte_pktmbuf_free(struct rte_mbuf *m)
 {
 	spdk_mempool_put((struct spdk_mempool *)m->pool, (void *)m);
 }
 
-void rte_mempool_free(struct rte_mempool *mp)
+void
+rte_mempool_free(struct rte_mempool *mp)
 {
 	spdk_mempool_free((struct spdk_mempool *)mp);
 }
@@ -50,8 +53,9 @@ void rte_mempool_free(struct rte_mempool *mp)
 int mock_rte_pktmbuf_alloc_bulk(struct rte_mempool *pool, struct rte_mbuf **mbufs,
 				unsigned count);
 #define rte_pktmbuf_alloc_bulk mock_rte_pktmbuf_alloc_bulk
-int mock_rte_pktmbuf_alloc_bulk(struct rte_mempool *pool, struct rte_mbuf **mbufs,
-				unsigned count)
+int
+mock_rte_pktmbuf_alloc_bulk(struct rte_mempool *pool, struct rte_mbuf **mbufs,
+			    unsigned count)
 {
 	int rc;
 
diff --git a/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c b/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
index 5664b358a..cb08f1fab 100644
--- a/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
+++ b/test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c
@@ -47,8 +47,9 @@ DEFINE_RETURN_MOCK(spdk_nvme_ctrlr_get_memory_domain, int);
 DEFINE_STUB(spdk_nvme_ctrlr_get_discovery_log_page, int,
 	    (struct spdk_nvme_ctrlr *ctrlr, spdk_nvme_discovery_cb cb_fn, void *cb_arg), 0);
 
-int spdk_nvme_ctrlr_get_memory_domains(const struct spdk_nvme_ctrlr *ctrlr,
-				       struct spdk_memory_domain **domains, int array_size)
+int
+spdk_nvme_ctrlr_get_memory_domains(const struct spdk_nvme_ctrlr *ctrlr,
+				   struct spdk_memory_domain **domains, int array_size)
 {
 	HANDLE_RETURN_MOCK(spdk_nvme_ctrlr_get_memory_domain);
 
diff --git a/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c
index c5cb517e9..45222d0bc 100644
--- a/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c
+++ b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c
@@ -382,7 +382,8 @@ spdk_sprintf_alloc(const char *format, ...)
 	return strdup(format);
 }
 
-int spdk_json_write_named_uint32(struct spdk_json_write_ctx *w, const char *name, uint32_t val)
+int
+spdk_json_write_named_uint32(struct spdk_json_write_ctx *w, const char *name, uint32_t val)
 {
 	struct rpc_bdev_raid_create *req = g_rpc_req;
 	if (strcmp(name, "strip_size_kb") == 0) {
@@ -401,7 +402,8 @@ int spdk_json_write_named_uint32(struct spdk_json_write_ctx *w, const char *name
 	return 0;
 }
 
-int spdk_json_write_named_string(struct spdk_json_write_ctx *w, const char *name, const char *val)
+int
+spdk_json_write_named_string(struct spdk_json_write_ctx *w, const char *name, const char *val)
 {
 	struct rpc_bdev_raid_create *req = g_rpc_req;
 	if (strcmp(name, "raid_level") == 0) {
@@ -2044,7 +2046,8 @@ test_raid_level_conversions(void)
 	CU_ASSERT(raid_str != NULL && strcmp(raid_str, "raid0") == 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite       suite = NULL;
 	unsigned int    num_failures;
diff --git a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
index 3e27f149f..c8c319d63 100644
--- a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
+++ b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
@@ -1483,7 +1483,8 @@ ut_lvs_rename(void)
 	free(g_base_bdev);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c b/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c
index ebb31d78a..b56b3830f 100644
--- a/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c
+++ b/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c
@@ -149,7 +149,8 @@ spdk_bdev_unregister_by_name(const char *bdev_name, struct spdk_bdev_module *mod
 	return 0;
 }
 
-int spdk_json_write_named_uint64(struct spdk_json_write_ctx *w, const char *name, uint64_t val)
+int
+spdk_json_write_named_uint64(struct spdk_json_write_ctx *w, const char *name, uint64_t val)
 {
 	struct rpc_construct_zone_block *req = g_rpc_req;
 	if (strcmp(name, "zone_capacity") == 0) {
@@ -1458,7 +1459,8 @@ test_append_zone(void)
 	test_cleanup();
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite       suite = NULL;
 	unsigned int    num_failures;
diff --git a/test/unit/lib/blob/blob.c/blob_ut.c b/test/unit/lib/blob/blob.c/blob_ut.c
index 83c226703..634c9ad3b 100644
--- a/test/unit/lib/blob/blob.c/blob_ut.c
+++ b/test/unit/lib/blob/blob.c/blob_ut.c
@@ -7194,7 +7194,8 @@ suite_blob_cleanup(void)
 	CU_ASSERT(g_bs == NULL);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite, suite_bs, suite_blob;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
index c05dd3efe..b3509a234 100644
--- a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
+++ b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c
@@ -619,7 +619,8 @@ channel_ops_sync(void)
 	g_fs = NULL;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c b/test/unit/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c
index fce34ce68..5c1f9eada 100644
--- a/test/unit/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c
+++ b/test/unit/lib/blobfs/blobfs_bdev.c/blobfs_bdev_ut.c
@@ -276,7 +276,8 @@ spdk_blobfs_bdev_mount_test(void)
 #endif
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
index c34cf8d62..2e97ea16e 100644
--- a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
+++ b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c
@@ -591,7 +591,8 @@ spdk_thread(void *arg)
 	return NULL;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	struct spdk_thread *thread;
 	CU_pSuite	suite = NULL;
diff --git a/test/unit/lib/blobfs/tree.c/tree_ut.c b/test/unit/lib/blobfs/tree.c/tree_ut.c
index 05855f6c6..056bb277b 100644
--- a/test/unit/lib/blobfs/tree.c/tree_ut.c
+++ b/test/unit/lib/blobfs/tree.c/tree_ut.c
@@ -102,7 +102,8 @@ blobfs_tree_op_test(void)
 	free(tree);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/env_dpdk/pci_event.c/pci_event_ut.c b/test/unit/lib/env_dpdk/pci_event.c/pci_event_ut.c
index f787a074a..6841b0b74 100644
--- a/test/unit/lib/env_dpdk/pci_event.c/pci_event_ut.c
+++ b/test/unit/lib/env_dpdk/pci_event.c/pci_event_ut.c
@@ -115,7 +115,8 @@ test_pci_parse_event(void)
 
 #endif
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c b/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
index 1b2772017..078db663a 100644
--- a/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
+++ b/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
@@ -211,7 +211,8 @@ test_idxd_wait_cmd(void)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/ioat/ioat.c/ioat_ut.c b/test/unit/lib/ioat/ioat.c/ioat_ut.c
index 203a8e4e0..450431895 100644
--- a/test/unit/lib/ioat/ioat.c/ioat_ut.c
+++ b/test/unit/lib/ioat/ioat.c/ioat_ut.c
@@ -48,7 +48,8 @@ spdk_pci_device_cfg_write32(struct spdk_pci_device *dev, uint32_t value,
 	return 0;
 }
 
-static void ioat_state_check(void)
+static void
+ioat_state_check(void)
 {
 	/*
 	 * CHANSTS's STATUS field is 3 bits (8 possible values), but only has 5 valid states:
@@ -96,7 +97,8 @@ static void ioat_state_check(void)
 	CU_ASSERT(is_ioat_halted(7) == 0); /* reserved */
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/iscsi/conn.c/conn_ut.c b/test/unit/lib/iscsi/conn.c/conn_ut.c
index 593a75617..93869c208 100644
--- a/test/unit/lib/iscsi/conn.c/conn_ut.c
+++ b/test/unit/lib/iscsi/conn.c/conn_ut.c
@@ -537,7 +537,8 @@ dequeue_task(void *_head, struct spdk_iscsi_task *task)
 	return false;
 }
 
-static void iscsi_conn_pdu_dummy_complete(void *arg)
+static void
+iscsi_conn_pdu_dummy_complete(void *arg)
 {
 }
 
diff --git a/test/unit/lib/json/json_parse.c/json_parse_ut.c b/test/unit/lib/json/json_parse.c/json_parse_ut.c
index 58629dd4a..121acce4f 100644
--- a/test/unit/lib/json/json_parse.c/json_parse_ut.c
+++ b/test/unit/lib/json/json_parse.c/json_parse_ut.c
@@ -870,7 +870,8 @@ test_parse_comment(void)
 	PARSE_FAIL_FLAGS("[0/", SPDK_JSON_PARSE_INCOMPLETE, SPDK_JSON_PARSE_FLAG_ALLOW_COMMENTS);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/json/json_util.c/json_util_ut.c b/test/unit/lib/json/json_util.c/json_util_ut.c
index 28ddd9f8a..25c51e7bf 100644
--- a/test/unit/lib/json/json_util.c/json_util_ut.c
+++ b/test/unit/lib/json/json_util.c/json_util_ut.c
@@ -921,7 +921,8 @@ test_iterating(void)
 	free(values);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/json/json_write.c/json_write_ut.c b/test/unit/lib/json/json_write.c/json_write_ut.c
index f569475a1..8c642da82 100644
--- a/test/unit/lib/json/json_write.c/json_write_ut.c
+++ b/test/unit/lib/json/json_write.c/json_write_ut.c
@@ -816,7 +816,8 @@ test_write_val(void)
 	END("{\"a\":[1,2,3],\"b\":{\"c\":\"d\"},\"e\":true,\"f\":false,\"g\":null}");
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
index e9420e18b..a5dc6f1bc 100644
--- a/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
+++ b/test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut.c
@@ -356,7 +356,8 @@ test_parse_request_streaming(void)
 	free(server);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/log/log.c/log_ut.c b/test/unit/lib/log/log.c/log_ut.c
index 6fcea30eb..3d11e22ee 100644
--- a/test/unit/lib/log/log.c/log_ut.c
+++ b/test/unit/lib/log/log.c/log_ut.c
@@ -58,7 +58,8 @@ log_test(void)
 	spdk_log_close();
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/lvol/lvol.c/lvol_ut.c b/test/unit/lib/lvol/lvol.c/lvol_ut.c
index 33bb737a5..3b8f2d5a7 100644
--- a/test/unit/lib/lvol/lvol.c/lvol_ut.c
+++ b/test/unit/lib/lvol/lvol.c/lvol_ut.c
@@ -69,14 +69,16 @@ struct lvol_ut_bs_dev {
 	struct spdk_blob_store	*bs;
 };
 
-void spdk_bs_inflate_blob(struct spdk_blob_store *bs, struct spdk_io_channel *channel,
-			  spdk_blob_id blobid, spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_bs_inflate_blob(struct spdk_blob_store *bs, struct spdk_io_channel *channel,
+		     spdk_blob_id blobid, spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	cb_fn(cb_arg, g_inflate_rc);
 }
 
-void spdk_bs_blob_decouple_parent(struct spdk_blob_store *bs, struct spdk_io_channel *channel,
-				  spdk_blob_id blobid, spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_bs_blob_decouple_parent(struct spdk_blob_store *bs, struct spdk_io_channel *channel,
+			     spdk_blob_id blobid, spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	cb_fn(cb_arg, g_inflate_rc);
 }
@@ -115,7 +117,8 @@ spdk_bs_iter_first(struct spdk_blob_store *bs,
 	cb_fn(cb_arg, first, _errno);
 }
 
-uint64_t spdk_blob_get_num_clusters(struct spdk_blob *blob)
+uint64_t
+spdk_blob_get_num_clusters(struct spdk_blob *blob)
 {
 	return 0;
 }
@@ -163,7 +166,8 @@ struct spdk_io_channel *spdk_bs_alloc_io_channel(struct spdk_blob_store *bs)
 	return g_io_channel;
 }
 
-void spdk_bs_free_io_channel(struct spdk_io_channel *channel)
+void
+spdk_bs_free_io_channel(struct spdk_io_channel *channel)
 {
 	g_io_channel->ref--;
 	if (g_io_channel->ref == 0) {
@@ -206,7 +210,8 @@ spdk_blob_get_xattr_value(struct spdk_blob *blob, const char *name,
 	return -ENOENT;
 }
 
-bool spdk_blob_is_thin_provisioned(struct spdk_blob *blob)
+bool
+spdk_blob_is_thin_provisioned(struct spdk_blob *blob)
 {
 	return blob->thin_provisioned;
 }
@@ -319,7 +324,8 @@ spdk_bs_opts_init(struct spdk_bs_opts *opts, size_t opts_size)
 
 DEFINE_STUB(spdk_bs_get_cluster_size, uint64_t, (struct spdk_blob_store *bs), BS_CLUSTER_SIZE);
 
-void spdk_blob_close(struct spdk_blob *b, spdk_blob_op_complete cb_fn, void *cb_arg)
+void
+spdk_blob_close(struct spdk_blob *b, spdk_blob_op_complete cb_fn, void *cb_arg)
 {
 	b->ref--;
 
@@ -1811,7 +1817,8 @@ lvs_rename(void)
 	CU_ASSERT(g_lvserrno == 0);
 	g_lvol_store = NULL;
 }
-static void lvol_refcnt(void)
+static void
+lvol_refcnt(void)
 {
 	struct lvol_ut_bs_dev dev;
 	struct spdk_lvs_opts opts;
@@ -2075,7 +2082,8 @@ lvol_get_xattr(void)
 	free_dev(&dev);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme.c/nvme_ut.c b/test/unit/lib/nvme/nvme.c/nvme_ut.c
index 3352e8b11..9a26ec12b 100644
--- a/test/unit/lib/nvme/nvme.c/nvme_ut.c
+++ b/test/unit/lib/nvme/nvme.c/nvme_ut.c
@@ -1584,7 +1584,8 @@ test_spdk_nvme_detach_async(void)
 	MOCK_CLEAR(nvme_ctrlr_get_ref_count);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
index 2ecf5685d..47c0d0e9a 100644
--- a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
+++ b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
@@ -279,10 +279,11 @@ nvme_driver_init(void)
 	return 0;
 }
 
-int nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,
-		    struct spdk_nvme_ctrlr *ctrlr,
-		    enum spdk_nvme_qprio qprio,
-		    uint32_t num_requests, bool async)
+int
+nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,
+		struct spdk_nvme_ctrlr *ctrlr,
+		enum spdk_nvme_qprio qprio,
+		uint32_t num_requests, bool async)
 {
 	qpair->id = id;
 	qpair->qprio = qprio;
@@ -1739,7 +1740,8 @@ test_alloc_io_qpair_wrr_2(void)
 
 bool g_connect_qpair_called = false;
 int g_connect_qpair_return_code = 0;
-int nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
+int
+nvme_transport_ctrlr_connect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
 {
 	g_connect_qpair_called = true;
 	qpair->state = NVME_QPAIR_CONNECTED;
@@ -2779,7 +2781,8 @@ test_nvme_ctrlr_ns_mgmt(void)
 	nvme_ctrlr_destruct(&ctrlr);
 }
 
-static void check_en_set_rdy(void)
+static void
+check_en_set_rdy(void)
 {
 	if (g_ut_nvme_regs.cc.bits.en == 1) {
 		g_ut_nvme_regs.csts.bits.rdy = 1;
@@ -3276,7 +3279,8 @@ test_nvme_ctrlr_get_memory_domains(void)
 	MOCK_CLEAR(nvme_transport_ctrlr_get_memory_domains);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
index 983eda3bc..0bc02d670 100644
--- a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
@@ -59,7 +59,8 @@ nvme_ns_cmp(struct spdk_nvme_ns *ns1, struct spdk_nvme_ns *ns2)
 
 RB_GENERATE_STATIC(nvme_ns_tree, spdk_nvme_ns, node, nvme_ns_cmp);
 
-static void verify_firmware_log_page(struct nvme_request *req)
+static void
+verify_firmware_log_page(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -71,7 +72,8 @@ static void verify_firmware_log_page(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_health_log_page(struct nvme_request *req)
+static void
+verify_health_log_page(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -83,7 +85,8 @@ static void verify_health_log_page(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_error_log_page(struct nvme_request *req)
+static void
+verify_error_log_page(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -95,7 +98,8 @@ static void verify_error_log_page(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_set_feature_cmd(struct nvme_request *req)
+static void
+verify_set_feature_cmd(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_SET_FEATURES);
 	CU_ASSERT(req->cmd.cdw10 == feature);
@@ -103,7 +107,8 @@ static void verify_set_feature_cmd(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw12 == feature_cdw12);
 }
 
-static void verify_set_feature_ns_cmd(struct nvme_request *req)
+static void
+verify_set_feature_ns_cmd(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_SET_FEATURES);
 	CU_ASSERT(req->cmd.cdw10 == expected_feature_cdw10);
@@ -112,14 +117,16 @@ static void verify_set_feature_ns_cmd(struct nvme_request *req)
 	CU_ASSERT(req->cmd.nsid == expected_feature_ns);
 }
 
-static void verify_get_feature_cmd(struct nvme_request *req)
+static void
+verify_get_feature_cmd(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_GET_FEATURES);
 	CU_ASSERT(req->cmd.cdw10 == get_feature);
 	CU_ASSERT(req->cmd.cdw11 == get_feature_cdw11);
 }
 
-static void verify_get_feature_ns_cmd(struct nvme_request *req)
+static void
+verify_get_feature_ns_cmd(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_GET_FEATURES);
 	CU_ASSERT(req->cmd.cdw10 == expected_feature_cdw10);
@@ -127,13 +134,15 @@ static void verify_get_feature_ns_cmd(struct nvme_request *req)
 	CU_ASSERT(req->cmd.nsid == expected_feature_ns);
 }
 
-static void verify_abort_cmd(struct nvme_request *req)
+static void
+verify_abort_cmd(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_ABORT);
 	CU_ASSERT(req->cmd.cdw10 == (((uint32_t)abort_cid << 16) | abort_sqid));
 }
 
-static void verify_io_cmd_raw_no_payload_build(struct nvme_request *req)
+static void
+verify_io_cmd_raw_no_payload_build(struct nvme_request *req)
 {
 	struct spdk_nvme_cmd    command = {};
 	struct nvme_payload     payload = {};
@@ -142,21 +151,24 @@ static void verify_io_cmd_raw_no_payload_build(struct nvme_request *req)
 	CU_ASSERT(memcmp(&req->payload, &payload, sizeof(req->payload)) == 0);
 }
 
-static void verify_io_raw_cmd(struct nvme_request *req)
+static void
+verify_io_raw_cmd(struct nvme_request *req)
 {
 	struct spdk_nvme_cmd	command = {};
 
 	CU_ASSERT(memcmp(&req->cmd, &command, sizeof(req->cmd)) == 0);
 }
 
-static void verify_io_raw_cmd_with_md(struct nvme_request *req)
+static void
+verify_io_raw_cmd_with_md(struct nvme_request *req)
 {
 	struct spdk_nvme_cmd	command = {};
 
 	CU_ASSERT(memcmp(&req->cmd, &command, sizeof(req->cmd)) == 0);
 }
 
-static void verify_set_host_id_cmd(struct nvme_request *req)
+static void
+verify_set_host_id_cmd(struct nvme_request *req)
 {
 	switch (expected_host_id_size) {
 	case 8:
@@ -174,7 +186,8 @@ static void verify_set_host_id_cmd(struct nvme_request *req)
 	}
 }
 
-static void verify_intel_smart_log_page(struct nvme_request *req)
+static void
+verify_intel_smart_log_page(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -187,7 +200,8 @@ static void verify_intel_smart_log_page(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_intel_temperature_log_page(struct nvme_request *req)
+static void
+verify_intel_temperature_log_page(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -198,7 +212,8 @@ static void verify_intel_temperature_log_page(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_intel_read_latency_log_page(struct nvme_request *req)
+static void
+verify_intel_read_latency_log_page(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -209,7 +224,8 @@ static void verify_intel_read_latency_log_page(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_intel_write_latency_log_page(struct nvme_request *req)
+static void
+verify_intel_write_latency_log_page(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -220,7 +236,8 @@ static void verify_intel_write_latency_log_page(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_intel_get_log_page_directory(struct nvme_request *req)
+static void
+verify_intel_get_log_page_directory(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -231,7 +248,8 @@ static void verify_intel_get_log_page_directory(struct nvme_request *req)
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_intel_marketing_description_log_page(struct nvme_request *req)
+static void
+verify_intel_marketing_description_log_page(struct nvme_request *req)
 {
 	uint32_t temp_cdw10;
 
@@ -243,62 +261,71 @@ static void verify_intel_marketing_description_log_page(struct nvme_request *req
 	CU_ASSERT(req->cmd.cdw10 == temp_cdw10);
 }
 
-static void verify_namespace_attach(struct nvme_request *req)
+static void
+verify_namespace_attach(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_NS_ATTACHMENT);
 	CU_ASSERT(req->cmd.cdw10 == SPDK_NVME_NS_CTRLR_ATTACH);
 	CU_ASSERT(req->cmd.nsid == namespace_management_nsid);
 }
 
-static void verify_namespace_detach(struct nvme_request *req)
+static void
+verify_namespace_detach(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_NS_ATTACHMENT);
 	CU_ASSERT(req->cmd.cdw10 == SPDK_NVME_NS_CTRLR_DETACH);
 	CU_ASSERT(req->cmd.nsid == namespace_management_nsid);
 }
 
-static void verify_namespace_create(struct nvme_request *req)
+static void
+verify_namespace_create(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_NS_MANAGEMENT);
 	CU_ASSERT(req->cmd.cdw10 == SPDK_NVME_NS_MANAGEMENT_CREATE);
 	CU_ASSERT(req->cmd.nsid == 0);
 }
 
-static void verify_namespace_delete(struct nvme_request *req)
+static void
+verify_namespace_delete(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_NS_MANAGEMENT);
 	CU_ASSERT(req->cmd.cdw10 == SPDK_NVME_NS_MANAGEMENT_DELETE);
 	CU_ASSERT(req->cmd.nsid == namespace_management_nsid);
 }
 
-static void verify_doorbell_buffer_config(struct nvme_request *req)
+static void
+verify_doorbell_buffer_config(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_DOORBELL_BUFFER_CONFIG);
 	CU_ASSERT(req->cmd.dptr.prp.prp1 == PRP_ENTRY_1);
 	CU_ASSERT(req->cmd.dptr.prp.prp2 == PRP_ENTRY_2);
 }
 
-static void verify_format_nvme(struct nvme_request *req)
+static void
+verify_format_nvme(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_FORMAT_NVM);
 	CU_ASSERT(req->cmd.cdw10 == 0);
 	CU_ASSERT(req->cmd.nsid == format_nvme_nsid);
 }
 
-static void verify_fw_commit(struct nvme_request *req)
+static void
+verify_fw_commit(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_FIRMWARE_COMMIT);
 	CU_ASSERT(req->cmd.cdw10 == 0x09);
 }
 
-static void verify_fw_image_download(struct nvme_request *req)
+static void
+verify_fw_image_download(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_FIRMWARE_IMAGE_DOWNLOAD);
 	CU_ASSERT(req->cmd.cdw10 == spdk_nvme_bytes_to_numd(fw_img_size));
 	CU_ASSERT(req->cmd.cdw11 == fw_img_offset >> 2);
 }
 
-static void verify_nvme_sanitize(struct nvme_request *req)
+static void
+verify_nvme_sanitize(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_SANITIZE);
 	CU_ASSERT(req->cmd.cdw10 == 0x309);
@@ -306,13 +333,15 @@ static void verify_nvme_sanitize(struct nvme_request *req)
 	CU_ASSERT(req->cmd.nsid == sanitize_nvme_nsid);
 }
 
-static void verify_directive_receive(struct nvme_request *req)
+static void
+verify_directive_receive(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_DIRECTIVE_RECEIVE);
 	CU_ASSERT(req->cmd.nsid == directive_nsid);
 }
 
-static void verify_directive_send(struct nvme_request *req)
+static void
+verify_directive_send(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_NVME_OPC_DIRECTIVE_SEND);
 	CU_ASSERT(req->cmd.nsid == directive_nsid);
@@ -431,7 +460,8 @@ test_error_get_log_page(void)
 	DECONSTRUCT_CTRLR();
 }
 
-static void test_intel_smart_get_log_page(void)
+static void
+test_intel_smart_get_log_page(void)
 {
 	DECLARE_AND_CONSTRUCT_CTRLR();
 	struct spdk_nvme_intel_smart_information_page	payload = {};
@@ -444,7 +474,8 @@ static void test_intel_smart_get_log_page(void)
 	DECONSTRUCT_CTRLR();
 }
 
-static void test_intel_temperature_get_log_page(void)
+static void
+test_intel_temperature_get_log_page(void)
 {
 	DECLARE_AND_CONSTRUCT_CTRLR();
 	struct spdk_nvme_intel_temperature_page	payload = {};
@@ -457,7 +488,8 @@ static void test_intel_temperature_get_log_page(void)
 	DECONSTRUCT_CTRLR();
 }
 
-static void test_intel_read_latency_get_log_page(void)
+static void
+test_intel_read_latency_get_log_page(void)
 {
 	DECLARE_AND_CONSTRUCT_CTRLR();
 	struct spdk_nvme_intel_rw_latency_page	payload = {};
@@ -471,7 +503,8 @@ static void test_intel_read_latency_get_log_page(void)
 	DECONSTRUCT_CTRLR();
 }
 
-static void test_intel_write_latency_get_log_page(void)
+static void
+test_intel_write_latency_get_log_page(void)
 {
 	DECLARE_AND_CONSTRUCT_CTRLR();
 	struct spdk_nvme_intel_rw_latency_page	payload = {};
@@ -485,7 +518,8 @@ static void test_intel_write_latency_get_log_page(void)
 	DECONSTRUCT_CTRLR();
 }
 
-static void test_intel_get_log_page_directory(void)
+static void
+test_intel_get_log_page_directory(void)
 {
 	DECLARE_AND_CONSTRUCT_CTRLR();
 	struct spdk_nvme_intel_log_page_directory	payload = {};
@@ -499,7 +533,8 @@ static void test_intel_get_log_page_directory(void)
 	DECONSTRUCT_CTRLR();
 }
 
-static void test_intel_marketing_description_get_log_page(void)
+static void
+test_intel_marketing_description_get_log_page(void)
 {
 	DECLARE_AND_CONSTRUCT_CTRLR();
 	struct spdk_nvme_intel_marketing_description_page	payload = {};
@@ -513,14 +548,16 @@ static void test_intel_marketing_description_get_log_page(void)
 	DECONSTRUCT_CTRLR();
 }
 
-static void test_generic_get_log_pages(void)
+static void
+test_generic_get_log_pages(void)
 {
 	test_error_get_log_page();
 	test_health_get_log_page();
 	test_firmware_get_log_page();
 }
 
-static void test_intel_get_log_pages(void)
+static void
+test_intel_get_log_pages(void)
 {
 	test_intel_get_log_page_directory();
 	test_intel_smart_get_log_page();
@@ -980,7 +1017,8 @@ test_spdk_nvme_ctrlr_cmd_security_receive_send(void)
 	DECONSTRUCT_CTRLR();
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut.c b/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut.c
index 85d3d158b..9bcc5ce77 100644
--- a/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ctrlr_ocssd_cmd.c/nvme_ctrlr_ocssd_cmd_ut.c
@@ -77,7 +77,8 @@ nvme_allocate_request_user_copy(struct spdk_nvme_qpair *qpair, void *buffer, uin
 	return nvme_allocate_request_contig(qpair, buffer, payload_size, cb_fn, cb_arg);
 }
 
-static void verify_geometry_cmd(struct nvme_request *req)
+static void
+verify_geometry_cmd(struct nvme_request *req)
 {
 	CU_ASSERT(req->cmd.opc == SPDK_OCSSD_OPC_GEOMETRY);
 	CU_ASSERT(req->cmd.nsid == expected_geometry_ns);
@@ -130,7 +131,8 @@ test_spdk_nvme_ctrlr_is_ocssd_supported(void)
 	CU_ASSERT(rc == false);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c b/test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c
index c9b847ed1..52eccbfca 100644
--- a/test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c
+++ b/test/unit/lib/nvme/nvme_cuse.c/nvme_cuse_ut.c
@@ -528,7 +528,8 @@ test_nvme_cuse_stop(void)
 	CU_ASSERT(TAILQ_EMPTY(&g_ctrlr_ctx_head));
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c b/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
index 74667425f..bd78cd9d5 100644
--- a/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
+++ b/test/unit/lib/nvme/nvme_fabric.c/nvme_fabric_ut.c
@@ -407,7 +407,8 @@ test_nvme_fabric_qpair_connect(void)
 	CU_ASSERT(rc == -EINVAL);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c b/test/unit/lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c
index a65b89632..2e1fc6abe 100644
--- a/test/unit/lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c
+++ b/test/unit/lib/nvme/nvme_io_msg.c/nvme_io_msg_ut.c
@@ -168,7 +168,8 @@ test_nvme_io_msg_ctrlr_register_unregister(void)
 	MOCK_CLEAR(spdk_nvme_ctrlr_alloc_io_qpair);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c
index bcdcb08ef..5de3fdf0d 100644
--- a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c
+++ b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c
@@ -493,7 +493,8 @@ test_nvme_ns_find_id_desc(void)
 	CU_ASSERT(csi == NULL);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
index d63ff00ab..7fc3e096e 100644
--- a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
@@ -68,11 +68,13 @@ spdk_pci_enumerate(struct spdk_pci_driver *driver, spdk_pci_enum_cb enum_cb, voi
 	return -1;
 }
 
-static void nvme_request_reset_sgl(void *cb_arg, uint32_t sgl_offset)
+static void
+nvme_request_reset_sgl(void *cb_arg, uint32_t sgl_offset)
 {
 }
 
-static int nvme_request_next_sge(void *cb_arg, void **address, uint32_t *length)
+static int
+nvme_request_next_sge(void *cb_arg, void **address, uint32_t *length)
 {
 	uint32_t *lba_count = cb_arg;
 
@@ -754,7 +756,8 @@ test_nvme_ns_cmd_readv(void)
 	cleanup_after_test(&qpair);
 }
 
-static int nvme_request_next_sge_invalid_prp1(void *cb_arg, void **address, uint32_t *length)
+static int
+nvme_request_next_sge_invalid_prp1(void *cb_arg, void **address, uint32_t *length)
 {
 	struct nvme_ns_cmd_ut_cb_arg *iovs = cb_arg;
 
@@ -2201,7 +2204,8 @@ test_spdk_nvme_ns_cmd_readv_ext(void)
 	cleanup_after_test(&qpair);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c b/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c
index de01fbb86..33e69394e 100644
--- a/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ns_ocssd_cmd.c/nvme_ns_ocssd_cmd_ut.c
@@ -631,7 +631,8 @@ test_nvme_ocssd_ns_cmd_vector_copy(void)
 	cleanup_after_test(&qpair);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c b/test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c
index 2d88f4216..989028413 100644
--- a/test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c
+++ b/test/unit/lib/nvme/nvme_opal.c/nvme_opal_ut.c
@@ -135,7 +135,8 @@ test_opal_add_short_atom_header(void)
 	CU_ASSERT(sess.cmd_pos == 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
index 344eeff33..c642482ab 100644
--- a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
+++ b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
@@ -399,7 +399,8 @@ test_nvme_pcie_hotplug_monitor(void)
 	g_spdk_nvme_driver = NULL;
 }
 
-static void test_shadow_doorbell_update(void)
+static void
+test_shadow_doorbell_update(void)
 {
 	bool ret;
 
@@ -1003,7 +1004,8 @@ test_nvme_pcie_ctrlr_config_pmr(void)
 	CU_ASSERT(rc == -EINVAL);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_pcie_common.c/nvme_pcie_common_ut.c b/test/unit/lib/nvme/nvme_pcie_common.c/nvme_pcie_common_ut.c
index a31fbed3c..2fe95d791 100644
--- a/test/unit/lib/nvme/nvme_pcie_common.c/nvme_pcie_common_ut.c
+++ b/test/unit/lib/nvme/nvme_pcie_common.c/nvme_pcie_common_ut.c
@@ -53,10 +53,11 @@ DEFINE_STUB(nvme_ctrlr_disable_poll, int, (struct spdk_nvme_ctrlr *ctrlr), 0);
 
 DEFINE_STUB_V(nvme_transport_ctrlr_disconnect_qpair_done, (struct spdk_nvme_qpair *qpair));
 
-int nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,
-		    struct spdk_nvme_ctrlr *ctrlr,
-		    enum spdk_nvme_qprio qprio,
-		    uint32_t num_requests, bool async)
+int
+nvme_qpair_init(struct spdk_nvme_qpair *qpair, uint16_t id,
+		struct spdk_nvme_ctrlr *ctrlr,
+		enum spdk_nvme_qprio qprio,
+		uint32_t num_requests, bool async)
 {
 	qpair->id = id;
 	qpair->qprio = qprio;
@@ -544,7 +545,8 @@ test_nvme_pcie_ctrlr_construct_admin_qpair(void)
 	CU_ASSERT(rc == 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
index 78fcf333e..3b0e409ce 100644
--- a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
+++ b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
@@ -126,7 +126,8 @@ test_ctrlr_failed(void)
 	cleanup_submit_request_test(&qpair);
 }
 
-static void struct_packing(void)
+static void
+struct_packing(void)
 {
 	/* ctrlr is the first field in nvme_qpair after the fields
 	 * that are used in the I/O path. Make sure the I/O path fields
@@ -148,7 +149,8 @@ dummy_cb_fn(void *cb_arg, const struct spdk_nvme_cpl *cpl)
 	}
 }
 
-static void test_nvme_qpair_process_completions(void)
+static void
+test_nvme_qpair_process_completions(void)
 {
 	struct spdk_nvme_qpair		admin_qp = {0};
 	struct spdk_nvme_qpair		qpair = {0};
@@ -272,7 +274,8 @@ static void test_nvme_qpair_process_completions(void)
 	free(admin_qp.req_buf);
 }
 
-static void test_nvme_completion_is_retry(void)
+static void
+test_nvme_completion_is_retry(void)
 {
 	struct spdk_nvme_cpl	cpl = {};
 
@@ -732,7 +735,8 @@ test_nvme_get_sgl_print_info(void)
 			   NVME_CMD_DPTR_STR_SIZE));
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c b/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
index f49c2c125..86c55debf 100644
--- a/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
+++ b/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
@@ -44,7 +44,8 @@ test_nvme_quirks_striping(void)
 	CU_ASSERT((quirks & NVME_INTEL_QUIRK_STRIPING) != 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c b/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c
index 5524e5c2d..c64337783 100644
--- a/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c
+++ b/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c
@@ -132,7 +132,8 @@ ibv_query_device(struct ibv_context *context,
 }
 
 /* essentially a simplification of bdev_nvme_next_sge and bdev_nvme_reset_sgl */
-static void nvme_rdma_ut_reset_sgl(void *cb_arg, uint32_t offset)
+static void
+nvme_rdma_ut_reset_sgl(void *cb_arg, uint32_t offset)
 {
 	struct nvme_rdma_ut_bdev_io *bio = cb_arg;
 	struct iovec *iov;
@@ -150,7 +151,8 @@ static void nvme_rdma_ut_reset_sgl(void *cb_arg, uint32_t offset)
 	SPDK_CU_ASSERT_FATAL(bio->iovpos < NVME_RDMA_MAX_SGL_DESCRIPTORS);
 }
 
-static int nvme_rdma_ut_next_sge(void *cb_arg, void **address, uint32_t *length)
+static int
+nvme_rdma_ut_next_sge(void *cb_arg, void **address, uint32_t *length)
 {
 	struct nvme_rdma_ut_bdev_io *bio = cb_arg;
 	struct iovec *iov;
@@ -1484,7 +1486,8 @@ test_nvme_rdma_poll_group_set_cq(void)
 	CU_ASSERT(rc == 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c b/test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c
index a2474a655..ee3abb477 100644
--- a/test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c
+++ b/test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c
@@ -1545,7 +1545,8 @@ test_nvme_tcp_ctrlr_delete_io_qpair(void)
 	CU_ASSERT(rc == 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c b/test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c
index b71bcc8e4..97cd10d58 100644
--- a/test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c
+++ b/test/unit/lib/nvme/nvme_transport.c/nvme_transport_ut.c
@@ -223,7 +223,8 @@ test_ctrlr_get_memory_domains(void)
 	TAILQ_REMOVE(&g_spdk_nvme_transports, &new_transport, link);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
index 2ac65448b..591d7a3bb 100644
--- a/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
+++ b/test/unit/lib/nvmf/ctrlr.c/ctrlr_ut.c
@@ -2864,7 +2864,8 @@ test_nvmf_ctrlr_set_features_host_behavior_support(void)
 	CU_ASSERT(req.rsp->nvme_cpl.status.sc == SPDK_NVME_SC_INVALID_FIELD);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c b/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
index ee67283b1..ff58e26c8 100644
--- a/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
+++ b/test/unit/lib/nvmf/ctrlr_bdev.c/ctrlr_bdev_ut.c
@@ -61,7 +61,11 @@ spdk_bdev_is_md_interleaved(const struct spdk_bdev *bdev)
 	return (bdev->md_len != 0) && bdev->md_interleave;
 }
 
-enum spdk_dif_type spdk_bdev_get_dif_type(const struct spdk_bdev *bdev)
+/* We have to use the typedef in the function declaration to appease astyle. */
+typedef enum spdk_dif_type spdk_dif_type_t;
+
+spdk_dif_type_t
+spdk_bdev_get_dif_type(const struct spdk_bdev *bdev)
 {
 	if (bdev->md_len != 0) {
 		return bdev->dif_type;
@@ -239,15 +243,17 @@ static uint32_t g_bdev_nvme_status_cdw0;
 static uint32_t g_bdev_nvme_status_sct = SPDK_NVME_SCT_GENERIC;
 static uint32_t g_bdev_nvme_status_sc = SPDK_NVME_SC_SUCCESS;
 
-static void reset_bdev_nvme_status(void)
+static void
+reset_bdev_nvme_status(void)
 {
 	g_bdev_nvme_status_cdw0 = 0;
 	g_bdev_nvme_status_sct = SPDK_NVME_SCT_GENERIC;
 	g_bdev_nvme_status_sc = SPDK_NVME_SC_SUCCESS;
 }
 
-void spdk_bdev_io_get_nvme_status(const struct spdk_bdev_io *bdev_io, uint32_t *cdw0, int *sct,
-				  int *sc)
+void
+spdk_bdev_io_get_nvme_status(const struct spdk_bdev_io *bdev_io, uint32_t *cdw0, int *sct,
+			     int *sc)
 {
 	*cdw0 = g_bdev_nvme_status_cdw0;
 	*sct = g_bdev_nvme_status_sct;
@@ -844,7 +850,8 @@ test_nvmf_bdev_ctrlr_nvme_passthru(void)
 	MOCK_SET(spdk_bdev_nvme_admin_passthru, 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
index d465aa1de..3f4568044 100644
--- a/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
+++ b/test/unit/lib/nvmf/ctrlr_discovery.c/ctrlr_discovery_ut.c
@@ -634,7 +634,8 @@ test_discovery_log_with_filters(void)
 	free(tgt.subsystems);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/fc.c/fc_ut.c b/test/unit/lib/nvmf/fc.c/fc_ut.c
index 1c0e4b685..40806f68f 100644
--- a/test/unit/lib/nvmf/fc.c/fc_ut.c
+++ b/test/unit/lib/nvmf/fc.c/fc_ut.c
@@ -456,7 +456,8 @@ nvmf_fc_tests_fini(void)
 	return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	unsigned int num_failures = 0;
 	CU_pSuite suite = NULL;
diff --git a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
index 5f0ccbefe..ffb462f42 100644
--- a/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
+++ b/test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c
@@ -827,7 +827,8 @@ usage(const char *program_name)
 	printf("            6 : Disconnect bad assoc_id test\n");
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	unsigned int num_failures = 0;
 	CU_pSuite suite = NULL;
diff --git a/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c b/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c
index 638eae86a..3419069aa 100644
--- a/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c
+++ b/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c
@@ -207,7 +207,8 @@ test_nvmf_tgt_create_poll_group(void)
 	MOCK_CLEAR(spdk_bdev_get_io_channel);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/rdma.c/rdma_ut.c b/test/unit/lib/nvmf/rdma.c/rdma_ut.c
index f65777f52..320fe327a 100644
--- a/test/unit/lib/nvmf/rdma.c/rdma_ut.c
+++ b/test/unit/lib/nvmf/rdma.c/rdma_ut.c
@@ -69,8 +69,9 @@ ibv_reg_mr(struct ibv_pd *pd, void *addr, size_t length, int access)
 	}
 }
 
-int ibv_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
-		 int attr_mask, struct ibv_qp_init_attr *init_attr)
+int
+ibv_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
+	     int attr_mask, struct ibv_qp_init_attr *init_attr)
 {
 	if (qp == NULL) {
 		return -1;
@@ -123,7 +124,8 @@ spdk_nvme_transport_id_populate_trstring(struct spdk_nvme_transport_id *trid, co
 	return 0;
 }
 
-static void reset_nvmf_rdma_request(struct spdk_nvmf_rdma_request *rdma_req)
+static void
+reset_nvmf_rdma_request(struct spdk_nvmf_rdma_request *rdma_req)
 {
 	int i;
 
@@ -1495,7 +1497,8 @@ test_nvmf_rdma_resize_cq(void)
 	CU_ASSERT(rpoller.num_cqe > tnum_cqe);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
index 3a0f1623e..288e06686 100644
--- a/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
+++ b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c
@@ -1690,7 +1690,8 @@ test_nvmf_ns_reservation_restore(void)
 	CU_ASSERT(rc == -EINVAL);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/tcp.c/tcp_ut.c b/test/unit/lib/nvmf/tcp.c/tcp_ut.c
index 2a12e7664..2db444b57 100644
--- a/test/unit/lib/nvmf/tcp.c/tcp_ut.c
+++ b/test/unit/lib/nvmf/tcp.c/tcp_ut.c
@@ -1237,7 +1237,8 @@ test_nvmf_tcp_pdu_ch_handle(void)
 			  struct spdk_nvme_tcp_common_pdu_hdr));
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/transport.c/transport_ut.c b/test/unit/lib/nvmf/transport.c/transport_ut.c
index d193e7e60..6b9c4b944 100644
--- a/test/unit/lib/nvmf/transport.c/transport_ut.c
+++ b/test/unit/lib/nvmf/transport.c/transport_ut.c
@@ -345,7 +345,8 @@ test_spdk_nvmf_transport_listen_ext(void)
 	CU_ASSERT(rc == 0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c b/test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c
index b465d0b32..97c7126f5 100644
--- a/test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c
+++ b/test/unit/lib/nvmf/vfio_user.c/vfio_user_ut.c
@@ -249,7 +249,8 @@ test_nvmf_vfio_user_create_destroy(void)
 	CU_ASSERT(done == 1);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/reduce/reduce.c/reduce_ut.c b/test/unit/lib/reduce/reduce.c/reduce_ut.c
index d81ff2272..c434e44b1 100644
--- a/test/unit/lib/reduce/reduce.c/reduce_ut.c
+++ b/test/unit/lib/reduce/reduce.c/reduce_ut.c
@@ -1535,7 +1535,8 @@ test_prepare_compress_chunk(void)
 	free(buf);
 }
 
-static void _reduce_vol_op_complete(void *ctx, int reduce_errno)
+static void
+_reduce_vol_op_complete(void *ctx, int reduce_errno)
 {
 	g_reduce_errno = reduce_errno;
 }
@@ -1548,7 +1549,8 @@ dummy_backing_dev_decompress(struct spdk_reduce_backing_dev *backing_dev,
 {
 	args->cb_fn(args->cb_arg, g_decompressed_len);
 }
-static void test_reduce_decompress_chunk(void)
+static void
+test_reduce_decompress_chunk(void)
 {
 	struct spdk_reduce_vol vol = {};
 	struct spdk_reduce_backing_dev backing_dev = {};
@@ -1786,7 +1788,8 @@ static void test_reduce_decompress_chunk(void)
 	free(buf);
 }
 
-static void test_allocate_vol_requests(void)
+static void
+test_allocate_vol_requests(void)
 {
 	struct spdk_reduce_vol *vol;
 	/* include chunk_sizes which are not power of 2 */
diff --git a/test/unit/lib/rpc/rpc.c/rpc_ut.c b/test/unit/lib/rpc/rpc.c/rpc_ut.c
index 75b101e3f..59dc6c415 100644
--- a/test/unit/lib/rpc/rpc.c/rpc_ut.c
+++ b/test/unit/lib/rpc/rpc.c/rpc_ut.c
@@ -37,8 +37,9 @@ DEFINE_WRAPPER(open, int, (const char *pathname, int flags, mode_t mode), (pathn
 DEFINE_WRAPPER(close, int, (int fd), (fd));
 DEFINE_WRAPPER(flock, int, (int fd, int operation), (fd, operation));
 
-int spdk_json_decode_object(const struct spdk_json_val *values,
-			    const struct spdk_json_object_decoder *decoders, size_t num_decoders, void *out)
+int
+spdk_json_decode_object(const struct spdk_json_val *values,
+			const struct spdk_json_object_decoder *decoders, size_t num_decoders, void *out)
 {
 	if (values ->type == SPDK_JSON_VAL_INVALID) {
 		return 1;
@@ -77,8 +78,9 @@ spdk_jsonrpc_send_error_response_fmt(struct spdk_jsonrpc_request *request,
 	g_rpc_err = error_code;
 }
 
-void fn_rpc_method_handler(struct spdk_jsonrpc_request *request,
-			   const struct spdk_json_val *params)
+void
+fn_rpc_method_handler(struct spdk_jsonrpc_request *request,
+		      const struct spdk_json_val *params)
 {
 	g_rpc_err = 0;
 }
@@ -235,7 +237,8 @@ test_spdk_rpc_listen_close(void)
 	MOCK_CLEAR(flock);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	CU_pSuite	suite = NULL;
 	unsigned int	num_failures;
diff --git a/test/unit/lib/scsi/lun.c/lun_ut.c b/test/unit/lib/scsi/lun.c/lun_ut.c
index 1c99577ff..2fdf2fb1e 100644
--- a/test/unit/lib/scsi/lun.c/lun_ut.c
+++ b/test/unit/lib/scsi/lun.c/lun_ut.c
@@ -110,7 +110,8 @@ bdev_scsi_execute(struct spdk_scsi_task *task)
 DEFINE_STUB(spdk_bdev_get_io_channel, struct spdk_io_channel *,
 	    (struct spdk_bdev_desc *desc), NULL);
 
-static struct spdk_scsi_lun *lun_construct(void)
+static struct spdk_scsi_lun *
+	lun_construct(void)
 {
 	struct spdk_scsi_lun		*lun;
 
diff --git a/test/unit/lib/vhost/vhost.c/vhost_ut.c b/test/unit/lib/vhost/vhost.c/vhost_ut.c
index 2d2972c16..e19645463 100644
--- a/test/unit/lib/vhost/vhost.c/vhost_ut.c
+++ b/test/unit/lib/vhost/vhost.c/vhost_ut.c
@@ -71,8 +71,9 @@ DEFINE_STUB(rte_vhost_extern_callback_register, int,
 /* rte_vhost_user.c shutdowns vhost_user sessions in a separte pthread */
 DECLARE_WRAPPER(pthread_create, int, (pthread_t *thread, const pthread_attr_t *attr,
 				      void *(*start_routine)(void *), void *arg));
-int pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void *),
-		   void *arg)
+int
+pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void *),
+	       void *arg)
 {
 	start_routine(arg);
 	return 0;