12622 grover: smatch and NULL pointer errors

Reviewed by: Gergő Doma <domag02@gmail.com> Reviewed by: Andrew Stormont <andyjstormont@gmail.com> Reviewed by: Patrick Mooney <pmooney@pfmooney.com> Approved by: Gordon Ross <gordon.w.ross@gmail.com>
illumos · May 10, 2020 · 12042ab · 12042ab
1 parent 5f94959
commit 12042ab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/usr/src/uts/sun4u/grover/io/grfans.c b/usr/src/uts/sun4u/grover/io/grfans.c
@@ -215,7 +215,7 @@ grfans_do_attach(dev_info_t *dip)
 
 	if (ddi_create_minor_node(dip, "cpu_fan", S_IFCHR,
 	    DEVINST_TO_MINOR(instance) | CHANNEL_TO_MINOR(CPU_FAN_CHANNEL),
-	    FANS_NODE_TYPE, NULL) == DDI_FAILURE) {
+	    FANS_NODE_TYPE, 0) == DDI_FAILURE) {
 		cmn_err(CE_WARN, "%s ddi_create_minor_node failed"
 		    " for cpu fan", name);
 		ddi_regs_map_free(&unitp->cpufan_rhandle);
@@ -228,7 +228,7 @@ grfans_do_attach(dev_info_t *dip)
 
 	if (ddi_create_minor_node(dip, "sys_fan", S_IFCHR,
 	    DEVINST_TO_MINOR(instance) | CHANNEL_TO_MINOR(SYSTEM_FAN_CHANNEL),
-	    FANS_NODE_TYPE, NULL) == DDI_FAILURE) {
+	    FANS_NODE_TYPE, 0) == DDI_FAILURE) {
 		cmn_err(CE_WARN, "%s ddi_create_minor_node failed"
 		    " for system fan", name);
 		ddi_regs_map_free(&unitp->cpufan_rhandle);

diff --git a/usr/src/uts/sun4u/grover/os/grover.c b/usr/src/uts/sun4u/grover/os/grover.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sunddi.h>
@@ -57,12 +55,12 @@ set_platform_defaults(void)
  * of Southbridge.
  */
 #define	GROVER_ISA_PATHNAME	"/pci@1f,0/isa@7"
-ddi_acc_handle_t 	grover_isa_handle;	/* handle for isa pci space */
+ddi_acc_handle_t	grover_isa_handle;	/* handle for isa pci space */
 
 void
 load_platform_drivers(void)
 {
-	dev_info_t 		*dip;		/* dip of the isa driver */
+	dev_info_t		*dip;		/* dip of the isa driver */
 
 
 	if (i_ddi_attach_hw_nodes("power") != DDI_SUCCESS)
@@ -88,12 +86,10 @@ load_platform_drivers(void)
 	dip = e_ddi_hold_devi_by_path(GROVER_ISA_PATHNAME, 0);
 	if (dip == NULL) {
 		cmn_err(CE_PANIC, "Could not install the isa driver\n");
-		return;
 	}
 
 	if (pci_config_setup(dip, &grover_isa_handle) != DDI_SUCCESS) {
 		cmn_err(CE_PANIC, "Could not get the config space of isa\n");
-		return;
 	}
 }
 

diff --git a/usr/src/uts/sun4u/grover/platmod/Makefile b/usr/src/uts/sun4u/grover/platmod/Makefile
@@ -40,7 +40,6 @@ UTSBASE	= ../../..
 #
 MODULE		= platmod
 OBJECTS		= $(GROVER_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(GROVER_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_GROVER_MISC_DIR)/$(MODULE)
 
 PLAT_DIR	= .
@@ -60,7 +59,6 @@ CLEANFILES	+= $(PLATLIB) $(SYM_MOD)
 #	Define targets
 #
 ALL_TARGET	= $(SYM_MOD)
-LINT_TARGET	= $(MODULE).lint
 INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 
 #
@@ -81,18 +79,10 @@ clean:		$(CLEAN_DEPS)
 
 clobber:	$(CLOBBER_DEPS)
 
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
 install:	$(INSTALL_DEPS)
 
 check:
 
-LINT_LIB_DIR	= $(GROVER_LINT_LIB_DIR)
-
 $(PLATLIB):	$(OBJECTS)
 	$(BUILD.SO) $(OBJECTS)