diff options
| author | Toomas Soome <tsoome@me.com> | 2020-01-31 08:30:24 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-06-03 20:27:29 +0300 |
| commit | 01e7b7f0889d1871183449cbcbc41e1f90f40610 (patch) | |
| tree | c9c4fed95f64890d635c435eb2e99306bb166bed /usr/src/uts/sun4u | |
| parent | d15d17d4231f87f1571fa6d585377206f360f667 (diff) | |
| download | illumos-joyent-01e7b7f0889d1871183449cbcbc41e1f90f40610.tar.gz | |
12565 max1617: NULL pointer errors
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/sun4u')
| -rw-r--r-- | usr/src/uts/sun4u/io/i2c/clients/max1617.c | 19 | ||||
| -rw-r--r-- | usr/src/uts/sun4u/max1617/Makefile | 13 |
2 files changed, 7 insertions, 25 deletions
diff --git a/usr/src/uts/sun4u/io/i2c/clients/max1617.c b/usr/src/uts/sun4u/io/i2c/clients/max1617.c index 00282c9c53..adf306ef7a 100644 --- a/usr/src/uts/sun4u/io/i2c/clients/max1617.c +++ b/usr/src/uts/sun4u/io/i2c/clients/max1617.c @@ -191,10 +191,10 @@ max1617_do_attach(dev_info_t *dip) MAX1617_FCN_TO_MINOR(MAX1617_CPU_TEMP); if (ddi_create_minor_node(dip, minor_name, S_IFCHR, - minor_number, MAX1617_NODE_TYPE, NULL) == DDI_FAILURE) { + minor_number, MAX1617_NODE_TYPE, 0) == DDI_FAILURE) { cmn_err(CE_WARN, "%s ddi_create_minor_node failed for minor " " name '%s'", unitp->max1617_name, minor_name); - ddi_soft_state_free(max1617_soft_statep, instance); + ddi_soft_state_free(max1617_soft_statep, instance); return (DDI_FAILURE); } @@ -204,7 +204,7 @@ max1617_do_attach(dev_info_t *dip) MAX1617_FCN_TO_MINOR(MAX1617_AMB_TEMP); if (ddi_create_minor_node(dip, minor_name, S_IFCHR, - minor_number, MAX1617_NODE_TYPE, NULL) == DDI_FAILURE) { + minor_number, MAX1617_NODE_TYPE, 0) == DDI_FAILURE) { cmn_err(CE_WARN, "%s ddi_create_minor_node failed for %s", unitp->max1617_name, minor_name); ddi_remove_minor_node(dip, NULL); @@ -525,10 +525,8 @@ max1617_close(dev_t dev, int flags, int otyp, cred_t *credp) } int -set_temp_limit(struct max1617_unit *unitp, - uchar_t device_reg, - caddr_t arg, - int mode) +set_temp_limit(struct max1617_unit *unitp, uchar_t device_reg, caddr_t arg, + int mode) { int err = 0; i2c_transfer_t *i2ctp; @@ -558,10 +556,7 @@ set_temp_limit(struct max1617_unit *unitp, } int -get_temp_limit(struct max1617_unit *unitp, - uchar_t reg, - caddr_t arg, - int mode) +get_temp_limit(struct max1617_unit *unitp, uchar_t reg, caddr_t arg, int mode) { int err = 0; i2c_transfer_t *i2ctp; @@ -591,7 +586,7 @@ get_temp_limit(struct max1617_unit *unitp, static int max1617_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)) struct max1617_unit *unitp; diff --git a/usr/src/uts/sun4u/max1617/Makefile b/usr/src/uts/sun4u/max1617/Makefile index fa8367fd6b..1c5104f147 100644 --- a/usr/src/uts/sun4u/max1617/Makefile +++ b/usr/src/uts/sun4u/max1617/Makefile @@ -35,7 +35,6 @@ UTSBASE = ../.. # MODULE = max1617 OBJECTS = $(MAX1617_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(MAX1617_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # @@ -43,11 +42,6 @@ ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - CERRWARN += -_gcc=-Wno-unused-label LDFLAGS += -dy -N misc/i2c_svc @@ -56,7 +50,6 @@ LDFLAGS += -dy -N misc/i2c_svc # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) .KEEP_STATE: @@ -69,12 +62,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # |