summaryrefslogtreecommitdiff
path: root/usr/src/cmd/devfsadm/devfsadm.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/devfsadm/devfsadm.c')
-rw-r--r--usr/src/cmd/devfsadm/devfsadm.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/usr/src/cmd/devfsadm/devfsadm.c b/usr/src/cmd/devfsadm/devfsadm.c
index 7cfcd09a81..79082ace48 100644
--- a/usr/src/cmd/devfsadm/devfsadm.c
+++ b/usr/src/cmd/devfsadm/devfsadm.c
@@ -390,8 +390,7 @@ main(int argc, char *argv[])
/* start the minor_fini_thread */
(void) mutex_init(&minor_fini_mutex, USYNC_THREAD, 0);
(void) cond_init(&minor_fini_cv, USYNC_THREAD, 0);
- if (thr_create(NULL, 0,
- (void *(*)(void *))minor_fini_thread,
+ if (thr_create(NULL, 0, minor_fini_thread,
NULL, THR_DETACHED, NULL)) {
err_print(CANT_CREATE_THREAD, "minor_fini",
strerror(errno));
@@ -2409,9 +2408,8 @@ load_module(char *mname, char *cdir)
* within 'timeout' secs the minor_fini_thread needs to do a SYNC_STATE
* so that we still call the minor_fini routines.
*/
-/*ARGSUSED*/
-static void
-minor_fini_thread(void *arg)
+static void *
+minor_fini_thread(void *arg __unused)
{
timestruc_t abstime;
@@ -2444,6 +2442,7 @@ minor_fini_thread(void *arg)
(void) mutex_lock(&minor_fini_mutex);
}
+ return (NULL);
}
@@ -4319,11 +4318,11 @@ hot_cleanup(char *node_path, char *minor_name, char *ev_subclass,
(void) snprintf(rmlink, sizeof (rmlink),
"%s", link->devlink);
if (rm->remove->flags & RM_NOINTERPOSE) {
- ((void (*)(char *))
- (rm->remove->callback_fcn))(rmlink);
+ (void)
+ (rm->remove->callback_fcn)(rmlink);
} else {
- ret = ((int (*)(char *))
- (rm->remove->callback_fcn))(rmlink);
+ ret =
+ (rm->remove->callback_fcn)(rmlink);
if (ret == DEVFSADM_TERMINATE)
nfphash_insert(rmlink);
}
@@ -4463,11 +4462,11 @@ matching_dev(char *devpath, void *data)
vprint(RECURSEDEV_MID, "%scalling callback %s\n", fcn, devpath);
if (cleanup_data->rm->remove->flags & RM_NOINTERPOSE)
- ((void (*)(char *))
- (cleanup_data->rm->remove->callback_fcn))(devpath);
+ (void)
+ (cleanup_data->rm->remove->callback_fcn)(devpath);
else {
- ret = ((int (*)(char *))
- (cleanup_data->rm->remove->callback_fcn))(devpath);
+ ret =
+ (cleanup_data->rm->remove->callback_fcn)(devpath);
if (ret == DEVFSADM_TERMINATE) {
/*
* We want no further remove processing for