Module Name: src
Committed By: tkusumi
Date: Sat Dec 14 10:49:30 UTC 2019
Modified Files:
src/sys/dev/dm: device-mapper.c dm_dev.c dm_table.c dm_target.c
Log Message:
dm: Remove void casts of function calls
Use of void casts in dm is not consistent, just get rid of them.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/dm/dm_dev.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/dm/dm_target.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.49 src/sys/dev/dm/device-mapper.c:1.50
--- src/sys/dev/dm/device-mapper.c:1.49 Wed Dec 11 14:03:37 2019
+++ src/sys/dev/dm/device-mapper.c Sat Dec 14 10:49:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: device-mapper.c,v 1.49 2019/12/11 14:03:37 tkusumi Exp $ */
+/* $NetBSD: device-mapper.c,v 1.50 2019/12/14 10:49:30 tkusumi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -282,7 +282,7 @@ dm_detach(device_t self, int flags)
disk_destroy(dmv->diskp);
/* Destroy device */
- (void)dm_dev_free(dmv);
+ dm_dev_free(dmv);
/* Decrement device counter After removing device */
atomic_dec_32(&dm_dev_counter);
@@ -505,9 +505,8 @@ disk_ioctl_switch(dev_t dev, u_long cmd,
* Call sync target routine for all table entries. Target sync
* routine basically call DIOCCACHESYNC on underlying devices.
*/
- SLIST_FOREACH(table_en, tbl, next) {
- (void)table_en->target->sync(table_en);
- }
+ SLIST_FOREACH(table_en, tbl, next)
+ table_en->target->sync(table_en);
dm_table_release(&dmv->table_head, DM_TABLE_ACTIVE);
dm_dev_unbusy(dmv);
break;
Index: src/sys/dev/dm/dm_dev.c
diff -u src/sys/dev/dm/dm_dev.c:1.14 src/sys/dev/dm/dm_dev.c:1.15
--- src/sys/dev/dm/dm_dev.c:1.14 Sat Dec 7 15:28:39 2019
+++ src/sys/dev/dm/dm_dev.c Sat Dec 14 10:49:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_dev.c,v 1.14 2019/12/07 15:28:39 tkusumi Exp $ */
+/* $NetBSD: dm_dev.c,v 1.15 2019/12/14 10:49:30 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.14 2019/12/07 15:28:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.15 2019/12/14 10:49:30 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -306,7 +306,7 @@ dm_dev_destroy(void)
mutex_destroy(&dmv->dev_mtx);
cv_destroy(&dmv->dev_cv);
- (void)kmem_free(dmv, sizeof(dm_dev_t));
+ kmem_free(dmv, sizeof(dm_dev_t));
}
mutex_exit(&dm_dev_mutex);
@@ -340,9 +340,9 @@ dm_dev_free(dm_dev_t *dmv)
cv_destroy(&dmv->dev_cv);
if (dmv->diskp != NULL)
- (void)kmem_free(dmv->diskp, sizeof(struct disk));
+ kmem_free(dmv->diskp, sizeof(struct disk));
- (void)kmem_free(dmv, sizeof(dm_dev_t));
+ kmem_free(dmv, sizeof(dm_dev_t));
return 0;
}
Index: src/sys/dev/dm/dm_table.c
diff -u src/sys/dev/dm/dm_table.c:1.12 src/sys/dev/dm/dm_table.c:1.13
--- src/sys/dev/dm/dm_table.c:1.12 Sat Dec 7 15:28:39 2019
+++ src/sys/dev/dm/dm_table.c Sat Dec 14 10:49:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_table.c,v 1.12 2019/12/07 15:28:39 tkusumi Exp $ */
+/* $NetBSD: dm_table.c,v 1.13 2019/12/14 10:49:30 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.12 2019/12/07 15:28:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.13 2019/12/14 10:49:30 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -248,7 +248,7 @@ dm_table_disksize(dm_table_head_t *head,
secsize = 0;
SLIST_FOREACH(table_en, tbl, next) {
length += table_en->length;
- (void)table_en->target->secsize(table_en, &tsecsize);
+ table_en->target->secsize(table_en, &tsecsize);
if (secsize < tsecsize)
secsize = tsecsize;
}
Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.27 src/sys/dev/dm/dm_target.c:1.28
--- src/sys/dev/dm/dm_target.c:1.27 Fri Dec 13 16:15:54 2019
+++ src/sys/dev/dm/dm_target.c Sat Dec 14 10:49:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target.c,v 1.27 2019/12/13 16:15:54 tkusumi Exp $ */
+/* $NetBSD: dm_target.c,v 1.28 2019/12/14 10:49:30 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.27 2019/12/13 16:15:54 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.28 2019/12/14 10:49:30 tkusumi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -87,7 +87,7 @@ dm_target_autoload(const char *dm_target
gen = module_gen;
/* Try to autoload target module */
- (void)module_autoload(name, MODULE_CLASS_MISC);
+ module_autoload(name, MODULE_CLASS_MISC);
} while (gen != module_gen);
mutex_enter(&dm_target_mutex);
@@ -228,7 +228,7 @@ dm_target_rem(const char *dm_target_name
mutex_exit(&dm_target_mutex);
- (void)kmem_free(dmt, sizeof(dm_target_t));
+ kmem_free(dmt, sizeof(dm_target_t));
return 0;
}
@@ -247,7 +247,7 @@ dm_target_destroy(void)
while ((dm_target = TAILQ_FIRST(&dm_target_list)) != NULL) {
TAILQ_REMOVE(&dm_target_list, dm_target, dm_target_next);
- (void)kmem_free(dm_target, sizeof(dm_target_t));
+ kmem_free(dm_target, sizeof(dm_target_t));
}
KASSERT(TAILQ_EMPTY(&dm_target_list));
