From f91894490bbf2f5cdaa0ddb023766677fcefe39c Mon Sep 17 00:00:00 2001 From: Dariusz Stojaczyk Date: Mon, 13 Nov 2017 17:57:27 +0100 Subject: [PATCH] event/subsystem: remove unused params from g_next_subsystem->fini Change-Id: I61ee650848cefe592fda23af8e1ed9aa6efb8b88 Signed-off-by: Dariusz Stojaczyk Reviewed-on: https://review.gerrithub.io/386890 Reviewed-by: Jim Harris Reviewed-by: Ben Walker Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp --- include/spdk_internal/event.h | 2 +- lib/event/subsystem.c | 2 +- lib/event/subsystems/bdev/bdev.c | 2 +- lib/event/subsystems/copy/copy.c | 2 +- lib/event/subsystems/iscsi/iscsi.c | 2 +- lib/event/subsystems/net/net.c | 4 ++-- lib/event/subsystems/scsi/scsi.c | 2 +- lib/event/subsystems/vhost/vhost.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h index 13efd1f18..685c8b5a7 100644 --- a/include/spdk_internal/event.h +++ b/include/spdk_internal/event.h @@ -55,7 +55,7 @@ struct spdk_subsystem { const char *name; /* User must call spdk_subsystem_init_next() when they are done with their initialization. */ void (*init)(void); - void (*fini)(void *arg1, void *arg2); + void (*fini)(void); void (*config)(FILE *fp); TAILQ_ENTRY(spdk_subsystem) tailq; }; diff --git a/lib/event/subsystem.c b/lib/event/subsystem.c index eef73be2c..19b7a7489 100644 --- a/lib/event/subsystem.c +++ b/lib/event/subsystem.c @@ -190,7 +190,7 @@ _spdk_subsystem_fini_next(void *arg1, void *arg2) while (g_next_subsystem) { if (g_next_subsystem->fini) { - g_next_subsystem->fini(NULL, NULL); + g_next_subsystem->fini(); return; } g_next_subsystem = TAILQ_PREV(g_next_subsystem, spdk_subsystem_list, tailq); diff --git a/lib/event/subsystems/bdev/bdev.c b/lib/event/subsystems/bdev/bdev.c index 3405f9111..e0101c7a4 100644 --- a/lib/event/subsystems/bdev/bdev.c +++ b/lib/event/subsystems/bdev/bdev.c @@ -78,7 +78,7 @@ spdk_bdev_subsystem_finish_done(void *cb_arg) } static void -spdk_bdev_subsystem_finish(void *arg1, void *arg2) +spdk_bdev_subsystem_finish(void) { spdk_bdev_finish(spdk_bdev_subsystem_finish_done, NULL); } diff --git a/lib/event/subsystems/copy/copy.c b/lib/event/subsystems/copy/copy.c index 9a4120fcc..eaf2e0ba2 100644 --- a/lib/event/subsystems/copy/copy.c +++ b/lib/event/subsystems/copy/copy.c @@ -55,7 +55,7 @@ spdk_copy_engine_subsystem_finish_done(void *cb_arg) } static void -spdk_copy_engine_subsystem_finish(void *arg1, void *arg2) +spdk_copy_engine_subsystem_finish(void) { spdk_copy_engine_finish(spdk_copy_engine_subsystem_finish_done, NULL); } diff --git a/lib/event/subsystems/iscsi/iscsi.c b/lib/event/subsystems/iscsi/iscsi.c index 2afadc6ae..e2b2841ca 100644 --- a/lib/event/subsystems/iscsi/iscsi.c +++ b/lib/event/subsystems/iscsi/iscsi.c @@ -54,7 +54,7 @@ spdk_iscsi_subsystem_fini_done(void *arg) } static void -spdk_iscsi_subsystem_fini(void *arg1, void *arg2) +spdk_iscsi_subsystem_fini(void) { spdk_iscsi_fini(spdk_iscsi_subsystem_fini_done, NULL); } diff --git a/lib/event/subsystems/net/net.c b/lib/event/subsystems/net/net.c index f4f7d52e4..a28b0dfae 100644 --- a/lib/event/subsystems/net/net.c +++ b/lib/event/subsystems/net/net.c @@ -48,7 +48,7 @@ spdk_interface_subsystem_init(void) } static void -spdk_interface_subsystem_destroy(void *arg1, void *arg2) +spdk_interface_subsystem_destroy(void) { spdk_interface_destroy(); spdk_subsystem_fini_next(); @@ -68,7 +68,7 @@ spdk_net_subsystem_start(void) } static void -spdk_net_subsystem_fini(void *arg1, void *arg2) +spdk_net_subsystem_fini(void) { spdk_net_framework_fini(); spdk_subsystem_fini_next(); diff --git a/lib/event/subsystems/scsi/scsi.c b/lib/event/subsystems/scsi/scsi.c index 348fb442c..97ae3a3c0 100644 --- a/lib/event/subsystems/scsi/scsi.c +++ b/lib/event/subsystems/scsi/scsi.c @@ -48,7 +48,7 @@ spdk_scsi_subsystem_init(void) } static void -spdk_scsi_subsystem_fini(void *arg1, void *arg2) +spdk_scsi_subsystem_fini(void) { spdk_scsi_fini(); spdk_subsystem_fini_next(); diff --git a/lib/event/subsystems/vhost/vhost.c b/lib/event/subsystems/vhost/vhost.c index 8232c3bcd..d8f6824f3 100644 --- a/lib/event/subsystems/vhost/vhost.c +++ b/lib/event/subsystems/vhost/vhost.c @@ -48,7 +48,7 @@ spdk_vhost_subsystem_init(void) } static void -spdk_vhost_subsystem_fini(void *arg1, void *arg2) +spdk_vhost_subsystem_fini(void) { spdk_vhost_fini(); spdk_subsystem_fini_next();