6714582 DDI_MAJOR_T_NONE missing

6719334 mod_modname should be 'const char *'
6714560 sgen driver should be cp(1) clonable

1 files changed, 10 insertions, 10 deletions

diff --git a/usr/src/uts/common/os/modsysfile.c b/usr/src/uts/common/os/modsysfile.c
index 2294f1793b..58e1b556b1 100644
--- a/usr/src/uts/common/os/modsysfile.c
+++ b/usr/src/uts/common/os/modsysfile.c
@@ -2161,7 +2161,7 @@ make_aliases(struct bind **bhash)
 		return;
 
 	state = AL_NEW;
-	major = (major_t)-1;
+	major = DDI_MAJOR_T_NONE;
 	while (!done) {
 		token = kobj_lex(file, tokbuf, sizeof (tokbuf));
 		switch (token) {
@@ -2188,7 +2188,7 @@ make_aliases(struct bind **bhash)
 				break;
 			case AL_DRVNAME:
 				major = mod_name_to_major(drvbuf);
-				if (major == (major_t)-1) {
+				if (major == DDI_MAJOR_T_NONE) {
 					kobj_find_eol(file);
 					state = AL_NEW;
 				} else {
@@ -2238,7 +2238,7 @@ make_aliases(struct bind **bhash)
 
 			kobj_newline(file);
 			state = AL_NEW;
-			major = (major_t)-1;
+			major = DDI_MAJOR_T_NONE;
 			break;
 		default:
 			kobj_file_err(CE_WARN, file, tok_err, tokbuf);
@@ -2908,7 +2908,7 @@ impl_parlist_to_major(struct par_list *pl, char parents[])
 		}
 
 		/* parent specs cannot be mapped to a driver */
-		if (pl->par_major != (major_t)-1)
+		if (pl->par_major != DDI_MAJOR_T_NONE)
 			continue;
 
 		/* class spec */
@@ -2920,7 +2920,7 @@ impl_parlist_to_major(struct par_list *pl, char parents[])
 			if (strcmp(hwcp->hwc_class_name, hcl->class_name) != 0)
 				continue;
 			major = ddi_name_to_major(hcl->class_exporter);
-			ASSERT(major != (major_t)-1);
+			ASSERT(major != DDI_MAJOR_T_NONE);
 			if (parents[major] == 0) {
 				parents[major] = 1;
 				nmajor++;
@@ -3129,13 +3129,13 @@ append(struct hwc_spec *spec, struct par_list *par)
 static major_t
 get_major(char *parent)
 {
-	major_t major = (major_t)-1;
+	major_t major = DDI_MAJOR_T_NONE;
 	char *tmp, *driver = NULL;
 
 	if (*parent == '/')
 		major = path_to_major(parent);
 
-	if (major != (major_t)-1)
+	if (major != DDI_MAJOR_T_NONE)
 		return (major);
 
 	/* extract the name between '/' and '@' */
@@ -3176,7 +3176,7 @@ add_spec(struct hwc_spec *spec, struct par_list **par)
 	 */
 	if (parent) {
 		maj = get_major(parent);
-		if (maj == (major_t)-1) {
+		if (maj == DDI_MAJOR_T_NONE) {
 			if ((*parent == '/') &&
 			    (strncmp(parent, "/pseudo", 7) != 0)) {
 				maj = (major_t)-2;
@@ -3189,7 +3189,7 @@ add_spec(struct hwc_spec *spec, struct par_list **par)
 			}
 		}
 	} else
-		maj = (major_t)-1;
+		maj = DDI_MAJOR_T_NONE;
 
 	/*
 	 * Scan the list looking for a matching parent. When parent is
@@ -3217,7 +3217,7 @@ add_spec(struct hwc_spec *spec, struct par_list **par)
 		return;
 	}
 	/* put "class=" entries last (lower pri if dups) */
-	if (maj == (major_t)-1) {
+	if (maj == DDI_MAJOR_T_NONE) {
 		par_last->par_next = pl;
 		return;
 	}