[illumos-gate merge]

commit cb2bfa207c033ee7d25890c8c31a9010f332fe48
    12112 devfsadm: cast between incompatible function types
commit 064d16273d15bf6b8ef164ed9d00a767e2fcd0ed
    12130 nfs/statd: cast between incompatible function types
commit f7afc1fdb20343a25c4d88d6e7004d102e4c3e38
    12135 ECRC PCIe errors shouldn't be fatal
    12136 Want hook to disable PCIe link monitoring
    12134 Capture PCIe aspm status
commit 07493f32b693ae8ddef96861c721ea94eb66b126
    12118 system/library/install has gone

2 files changed, 13 insertions, 14 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
diff --git a/usr/src/cmd/devfsadm/devfsadm_impl.h b/usr/src/cmd/devfsadm/devfsadm_impl.h
index b33caa1a4d..5e68e9236d 100644
--- a/usr/src/cmd/devfsadm/devfsadm_impl.h
+++ b/usr/src/cmd/devfsadm/devfsadm_impl.h
@@ -423,7 +423,7 @@ static int create_link_common(char *devlink, char *contents, int *exists);
 static char *dequote(char *src);
 static void parse_args(int argc, char *argv[]);
 static void process_devinfo_tree(void);
-static void minor_fini_thread(void *arg);
+static void *minor_fini_thread(void *arg);
 static void *s_realloc(void *ptr, const size_t size);
 static void read_devlinktab_file(void);
 static selector_list_t *create_selector_list(char *selector);