diff --git a/ipmitool/lib/ipmi_fru.c b/ipmitool/lib/ipmi_fru.c
index b27592b..52adaa2 100644
--- a/ipmitool/lib/ipmi_fru.c
+++ b/ipmitool/lib/ipmi_fru.c
@@ -1431,7 +1431,7 @@ ipmi_fru_write_from_bin(struct ipmi_intf * intf,
 	free(pFruBuf);
 }
 
-static void
+static int
 ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
 		     char * pFileName,
 		     uint8_t fruId)
@@ -1486,6 +1486,8 @@ ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
 
 	if (buf)
 		free(buf);
+
+	return retStatus;
 }
 
 static int
diff --git a/ipmitool/lib/ipmi_lanp.c b/ipmitool/lib/ipmi_lanp.c
index d2d81e2..662183e 100644
--- a/ipmitool/lib/ipmi_lanp.c
+++ b/ipmitool/lib/ipmi_lanp.c
@@ -1560,7 +1560,7 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
 	else {
 		ipmi_lan_set_usage();
 	}
-		
+
 	return rc;
 }
 
diff --git a/ipmitool/lib/ipmi_sel.c b/ipmitool/lib/ipmi_sel.c
index 3d2ab50..5d4e930 100644
--- a/ipmitool/lib/ipmi_sel.c
+++ b/ipmitool/lib/ipmi_sel.c
@@ -1332,7 +1332,7 @@ __ipmi_sel_savelist_entries(struct ipmi_intf * intf, int count, const char * sav
 
 	if (savefile != NULL) {
 		fp = ipmi_open_file_write(savefile);
-	}			
+	}
 
 	while (next_id != 0xffff) {
 		curr_id = next_id;
@@ -1498,7 +1498,7 @@ ipmi_sel_get_time(struct ipmi_intf * intf)
 			"Invalid data length %d", rsp->data_len);
 		return -1;
 	}
-	
+
 	memcpy(&timei, rsp->data, 4);
 #if WORDS_BIGENDIAN
 	timei = BSWAP_32(timei);
@@ -1551,7 +1551,7 @@ ipmi_sel_set_time(struct ipmi_intf * intf, const char * time_string)
 	}
 
 	timei = (uint32_t)t;
-	req.msg.data = (uint8_t *)&timei;	
+	req.msg.data = (uint8_t *)&timei;
 	req.msg.data_len = 4;
 
 #if WORDS_BIGENDIAN
@@ -1879,7 +1879,7 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
 		} else {
 			lprintf(LOG_ERR, "sel time commands: get set");
 		}
-	}			
+	}
 	else {
 		lprintf(LOG_ERR, "Invalid SEL command: %s", argv[0]);
 		rc = -1;
@@ -1887,4 +1887,3 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
 
 	return rc;
 }
-
diff --git a/ipmitool/src/ipmishell.c b/ipmitool/src/ipmishell.c
index 6fefe3d..f7aca49 100644
--- a/ipmitool/src/ipmishell.c
+++ b/ipmitool/src/ipmishell.c
@@ -132,7 +132,7 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
 
 		/* for the all-important up arrow :) */
 		add_history(pbuf);
-		
+
 		/* change "" and '' with spaces in the middle to ~ */
 		ptr = pbuf;
 		while (*ptr != '\0') {
@@ -196,7 +196,7 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
 					  &(__argv[1]));
 
 		free(pbuf);
-	}	
+	}
 	return rc;
 }
 
@@ -429,4 +429,3 @@ int ipmi_exec_main(struct ipmi_intf * intf, int argc, char ** argv)
 	fclose(fp);
 	return rc;
 }
-