diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/sun4/io/su_driver.c | 26 | ||||
| -rw-r--r-- | usr/src/uts/sun4/io/tod.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/epic/Makefile | 15 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/io/epic.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/io/i2c/clients/pcf8591.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/io/i2c/clients/tda8444.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/pcf8591/Makefile | 17 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/su/Makefile | 22 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/tda8444/Makefile | 13 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/tod/Makefile | 13 | ||||
| -rw-r--r-- | usr/src/uts/sun4v/su/Makefile | 22 |
11 files changed, 20 insertions, 122 deletions
diff --git a/usr/src/uts/sun4/io/su_driver.c b/usr/src/uts/sun4/io/su_driver.c index bab12d1a9b..d2a5a22b18 100644 --- a/usr/src/uts/sun4/io/su_driver.c +++ b/usr/src/uts/sun4/io/su_driver.c @@ -247,7 +247,7 @@ static int asyprobe(dev_info_t *); static int asyattach(dev_info_t *, ddi_attach_cmd_t); static int asydetach(dev_info_t *, ddi_detach_cmd_t); -static struct cb_ops cb_asy_ops = { +static struct cb_ops cb_asy_ops = { nodev, /* cb_open */ nodev, /* cb_close */ nodev, /* cb_strategy */ @@ -363,8 +363,8 @@ asyprobe(dev_info_t *devi) /* * Probe for the device: - * Ser. int. uses bits 0,1,2; FIFO uses 3,6,7; 4,5 wired low. - * If bit 4 or 5 appears on inb() ISR, board is not there. + * Ser. int. uses bits 0,1,2; FIFO uses 3,6,7; 4,5 wired low. + * If bit 4 or 5 appears on inb() ISR, board is not there. */ if (ddi_get8(handle, addr+ISR) & 0x30) { ddi_regs_map_free(&handle); @@ -709,8 +709,7 @@ asyattach(dev_info_t *devi, ddi_attach_cmd_t cmd) * create the minor device for this node. */ if (ddi_create_minor_node(devi, "ssp", S_IFCHR, - asy->asy_unit | RSC_DEVICE, DDI_PSEUDO, NULL) - == DDI_FAILURE) { + asy->asy_unit | RSC_DEVICE, DDI_PSEUDO, 0) == DDI_FAILURE) { cmn_err(CE_WARN, "%s%d: Failed to create node rsc-console", ddi_get_name(devi), ddi_get_instance(devi)); @@ -732,7 +731,7 @@ asyattach(dev_info_t *devi, ddi_attach_cmd_t cmd) * serial instances. */ if (ddi_create_minor_node(devi, "lom-console", S_IFCHR, - instance, DDI_NT_SERIAL_LOMCON, NULL) == DDI_FAILURE) { + instance, DDI_NT_SERIAL_LOMCON, 0) == DDI_FAILURE) { cmn_err(CE_WARN, "%s%d: Failed to create node lom-console", ddi_get_name(devi), ddi_get_instance(devi)); @@ -750,8 +749,7 @@ asyattach(dev_info_t *devi, ddi_attach_cmd_t cmd) * create the minor device for this node. */ if (ddi_create_minor_node(devi, "sspctl", S_IFCHR, - asy->asy_unit | RSC_DEVICE, DDI_PSEUDO, NULL) - == DDI_FAILURE) { + asy->asy_unit | RSC_DEVICE, DDI_PSEUDO, 0) == DDI_FAILURE) { cmn_err(CE_WARN, "%s%d: Failed to create rsc-control", ddi_get_name(devi), ddi_get_instance(devi)); goto error; @@ -775,7 +773,7 @@ asyattach(dev_info_t *devi, ddi_attach_cmd_t cmd) goto error; } asy->asy_flags |= ASY_IGNORE_CD; /* ignore cd */ - asy->asy_device_type = ASY_KEYBOARD; /* Device type */ + asy->asy_device_type = ASY_KEYBOARD; /* Device type */ } else if (ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS, "mouse", 0)) { /* @@ -797,14 +795,14 @@ asyattach(dev_info_t *devi, ddi_attach_cmd_t cmd) /* serial-port */ (void) sprintf(name, "%c", (instance+'a')); if (ddi_create_minor_node(devi, name, S_IFCHR, instance, - DDI_NT_SERIAL_MB, NULL) == DDI_FAILURE) { + DDI_NT_SERIAL_MB, 0) == DDI_FAILURE) { goto error; } state = MINORNODE; /* serial-port:dailout */ (void) sprintf(name, "%c,cu", (instance+'a')); if (ddi_create_minor_node(devi, name, S_IFCHR, instance|OUTLINE, - DDI_NT_SERIAL_MB_DO, NULL) == DDI_FAILURE) { + DDI_NT_SERIAL_MB_DO, 0) == DDI_FAILURE) { goto error; } /* Property for ignoring DCD */ @@ -917,8 +915,8 @@ asyopen(queue_t *rq, dev_t *dev, int flag, int sflag, cred_t *cr) struct asyncline *async; int mcr; int unit; - int len; - struct termios *termiosp; + int len; + struct termios *termiosp; #ifdef DEBUG if (asydebug & ASY_DEBUG_CLOSE) @@ -2640,7 +2638,7 @@ async_nstart(struct asyncline *async, int mode) * Therefore, the wait period is: * * (#TSR bits + #THR bits) * - * 1 MICROSEC / baud rate + * 1 MICROSEC / baud rate */ (void) timeout(async_restart, async, drv_usectohz(16 * MICROSEC / diff --git a/usr/src/uts/sun4/io/tod.c b/usr/src/uts/sun4/io/tod.c index 7d85f65fcf..07a8b1783b 100644 --- a/usr/src/uts/sun4/io/tod.c +++ b/usr/src/uts/sun4/io/tod.c @@ -192,7 +192,7 @@ tod_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) */ (void) sprintf(name, "tod%d", inst); if (ddi_create_minor_node(dip, name, S_IFCHR, inst, - DDI_PSEUDO, NULL) == DDI_FAILURE) + DDI_PSEUDO, 0) == DDI_FAILURE) goto attach_failed; /* diff --git a/usr/src/uts/sun4u/epic/Makefile b/usr/src/uts/sun4u/epic/Makefile index 5271a38d3e..7430e152e3 100644 --- a/usr/src/uts/sun4u/epic/Makefile +++ b/usr/src/uts/sun4u/epic/Makefile @@ -24,8 +24,6 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # This makefile drives the production of the epic driver # # sun4u implementation architecture dependent @@ -41,7 +39,6 @@ UTSBASE = ../.. # MODULE = epic OBJECTS = $(EPIC_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(EPIC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -53,15 +50,9 @@ include $(UTSBASE)/sun4u/Makefile.sun4u # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# # Turn on doubleword alignment for 64 bit registers # CFLAGS += -dalign @@ -79,12 +70,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/io/epic.c b/usr/src/uts/sun4u/io/epic.c index f982e26406..edb211daaf 100644 --- a/usr/src/uts/sun4u/io/epic.c +++ b/usr/src/uts/sun4u/io/epic.c @@ -210,7 +210,7 @@ epic_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) (void) sprintf(name, "env-monitor%d", inst); minor = inst; if (ddi_create_minor_node(dip, name, S_IFCHR, minor, - DDI_PSEUDO, NULL) == DDI_FAILURE) { + DDI_PSEUDO, 0) == DDI_FAILURE) { cmn_err(CE_WARN, "ddi_create_minor_node() failed for inst %d\n", inst); @@ -325,7 +325,7 @@ epic_close(dev_t dev, int flag, int otyp, cred_t *credp) /*ARGSUSED*/ static int epic_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *credp, -int *rvalp) + int *rvalp) { _NOTE(ARGUNUSED(credp)) diff --git a/usr/src/uts/sun4u/io/i2c/clients/pcf8591.c b/usr/src/uts/sun4u/io/i2c/clients/pcf8591.c index 3283fd02cb..bd70c6bba3 100644 --- a/usr/src/uts/sun4u/io/i2c/clients/pcf8591.c +++ b/usr/src/uts/sun4u/io/i2c/clients/pcf8591.c @@ -222,7 +222,7 @@ pcf8591_close(dev_t dev, int flags, int otyp, cred_t *credp) static int pcf8591_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, - cred_t *credp, int *rvalp) + cred_t *credp, int *rvalp) { _NOTE(ARGUNUSED(credp, rvalp)) @@ -236,7 +236,7 @@ pcf8591_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, int32_t value; uint8_t uvalue; - if (arg == NULL) { + if (arg == (intptr_t)NULL) { D2CMN_ERR((CE_WARN, "PCF8591: ioctl: arg passed in to ioctl " "= NULL\n")); err = EINVAL; @@ -485,7 +485,7 @@ pcf8591_do_attach(dev_info_t *dip) PORT_TO_MINOR(I2C_PORT(i)); if (ddi_create_minor_node(dip, name, S_IFCHR, minor_number, - "ddi_i2c:adio", NULL) == DDI_FAILURE) { + "ddi_i2c:adio", 0) == DDI_FAILURE) { cmn_err(CE_WARN, "%s ddi_create_minor_node failed for " "%s\n", unitp->pcf8591_name, name); ddi_soft_state_free(pcf8591soft_statep, instance); diff --git a/usr/src/uts/sun4u/io/i2c/clients/tda8444.c b/usr/src/uts/sun4u/io/i2c/clients/tda8444.c index 97f0c0c60d..bed11a1262 100644 --- a/usr/src/uts/sun4u/io/i2c/clients/tda8444.c +++ b/usr/src/uts/sun4u/io/i2c/clients/tda8444.c @@ -225,7 +225,7 @@ tda8444_do_attach(dev_info_t *dip) minor = TDA8444_CHANNEL_TO_MINOR(i) | TDA8444_DEVINST_TO_MINOR(instance); if (ddi_create_minor_node(dip, name, S_IFCHR, minor, - TDA8444_NODE_TYPE, NULL) == DDI_FAILURE) { + TDA8444_NODE_TYPE, 0) == DDI_FAILURE) { cmn_err(CE_WARN, "%s ddi_create_minor_node failed", unitp->tda8444_name); ddi_soft_state_free(tda8444_soft_statep, instance); diff --git a/usr/src/uts/sun4u/pcf8591/Makefile b/usr/src/uts/sun4u/pcf8591/Makefile index f220f64c66..a735a87d7f 100644 --- a/usr/src/uts/sun4u/pcf8591/Makefile +++ b/usr/src/uts/sun4u/pcf8591/Makefile @@ -22,10 +22,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# - # This makefile drives the pcf8591 build. # # Path to the base of the uts directory tree (usually /usr/src/uts). @@ -37,7 +33,6 @@ UTSBASE = ../.. # MODULE = pcf8591 OBJECTS = $(PCF8591_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(PCF8591_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -45,18 +40,12 @@ ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - LDFLAGS += -dy -N misc/i2c_svc # # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) .KEEP_STATE: @@ -69,12 +58,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/su/Makefile b/usr/src/uts/sun4u/su/Makefile index 533f0614ce..8f52c1877d 100644 --- a/usr/src/uts/sun4u/su/Makefile +++ b/usr/src/uts/sun4u/su/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = su OBJECTS = $(SU_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SU_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -52,23 +51,8 @@ include $(UTSBASE)/sun4u/Makefile.sun4u # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV - CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) @@ -85,12 +69,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/tda8444/Makefile b/usr/src/uts/sun4u/tda8444/Makefile index 544faf4462..08f8e697c9 100644 --- a/usr/src/uts/sun4u/tda8444/Makefile +++ b/usr/src/uts/sun4u/tda8444/Makefile @@ -35,7 +35,6 @@ UTSBASE = ../.. # MODULE = tda8444 OBJECTS = $(TDA8444_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(TDA8444_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -43,18 +42,12 @@ ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - LDFLAGS += -dy -N misc/i2c_svc # # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) .KEEP_STATE: @@ -67,12 +60,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4u/tod/Makefile b/usr/src/uts/sun4u/tod/Makefile index ad7e1028ad..41d61d51b2 100644 --- a/usr/src/uts/sun4u/tod/Makefile +++ b/usr/src/uts/sun4u/tod/Makefile @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = tod OBJECTS = $(TOD_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(TOD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun4/io @@ -54,14 +53,10 @@ include $(UTSBASE)/sun4u/Makefile.sun4u # Define targets # ALL_TARGET = $(BINARY) $(SRC_CONFFILE) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -# -# lint pass one enforcement -# CFLAGS += $(CCVERBOSE) -CERRWARN += -_gcc=-Wno-parentheses +CERRWARN += -_gcc=-Wno-parentheses # # Default build targets. @@ -76,12 +71,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sun4v/su/Makefile b/usr/src/uts/sun4v/su/Makefile index 5b2296ce5f..f3a631f4c8 100644 --- a/usr/src/uts/sun4v/su/Makefile +++ b/usr/src/uts/sun4v/su/Makefile @@ -40,7 +40,6 @@ UTSBASE = ../.. # MODULE = su OBJECTS = $(SU_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SU_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -52,23 +51,8 @@ include $(UTSBASE)/sun4v/Makefile.sun4v # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV - CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) @@ -85,12 +69,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # |