rasdaemon: coding style cleanup

Solve lots of coding style issues reported by: ./scripts/checkpatch.pl --terse --show-types --strict \ -f $(git ls-files|grep -E '\.[ch]$') \ --ignore MACRO_ARG_REUSE,STRCPY,IF_0,UNNECESSARY_PARENTHESES,CAMELCASE,STRNCPY; done Signed-off-by: Mauro Carvalho Chehab <[email protected]>
mchehab · Jul 16, 2024 · 7a69b22 · 7a69b22
1 parent 5f8ec6f
commit 7a69b22
Show file tree

Hide file tree

Showing 49 changed files with 1,009 additions and 959 deletions.
diff --git a/bitfield.c b/bitfield.c
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>
 
 #include "ras-mce-handler.h"
 #include "bitfield.h"
 
-unsigned int bitfield_msg(char *buf, size_t len, const char **bitarray,
+unsigned int bitfield_msg(char *buf, size_t len, const char * const *bitarray,
 			  unsigned int array_len,
 			  unsigned int bit_offset, unsigned int ignore_bits,
 			  uint64_t status)
@@ -86,8 +86,9 @@ void decode_bitfield(struct mce_event *e, uint64_t status,
 				continue;
 			mce_snprintf(e->error_msg, "<%u:%llx>",
 				     f->start_bit, (long long)v);
-		} else
+		} else {
 			mce_snprintf(e->error_msg, "%s", s);
+		}
 	}
 }
 

diff --git a/bitfield.h b/bitfield.h
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <stdint.h>
 
@@ -60,7 +60,7 @@ static inline int test_prefix(int nr, uint32_t value)
 
 /* Ancillary routines */
 
-unsigned int bitfield_msg(char *buf, size_t len, const char **bitarray,
+unsigned int bitfield_msg(char *buf, size_t len, const char * const *bitarray,
 			  unsigned int array_len,
 			  unsigned int bit_offset, unsigned int ignore_bits,
 			  uint64_t status);
diff --git a/mce-amd-k8.c b/mce-amd-k8.c
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +33,7 @@
 #define K8_MCELOG_THRESHOLD_L3_CACHE (4 * 9 + 2)
 #define K8_MCELOG_THRESHOLD_FBDIMM   (4 * 9 + 3)
 
-static const char *k8bank[] = {
+static const char * const k8bank[] = {
 	"data cache",
 	"instruction cache",
 	"bus unit",
@@ -42,7 +42,7 @@ static const char *k8bank[] = {
 	"fixed-issue reoder"
 };
 
-static const char *k8threshold[] = {
+static const char * const k8threshold[] = {
 	[0 ... K8_MCELOG_THRESHOLD_DRAM_ECC - 1] = "Unknown threshold counter",
 	[K8_MCELOG_THRESHOLD_DRAM_ECC] = "MC4_MISC0 DRAM threshold",
 	[K8_MCELOG_THRESHOLD_LINK] = "MC4_MISC1 Link threshold",
@@ -53,35 +53,35 @@ static const char *k8threshold[] = {
 		"Unknown threshold counter",
 };
 
-static const char *transaction[] = {
+static const char * const transaction[] = {
 	"instruction", "data", "generic", "reserved"
 };
 
-static const char *cachelevel[] = {
+static const char * const cachelevel[] = {
 	"0", "1", "2", "generic"
 };
 
-static const char *memtrans[] = {
+static const char * const memtrans[] = {
 	"generic error", "generic read", "generic write", "data read",
 	"data write", "instruction fetch", "prefetch", "evict", "snoop",
 	"?", "?", "?", "?", "?", "?", "?"
 };
 
-static const char *partproc[] = {
+static const char * const partproc[] = {
 	"local node origin", "local node response",
 	"local node observed", "generic participation"
 };
 
-static const char *timeout[] = {
+static const char * const timeout[] = {
 	"request didn't time out",
 	"request timed out"
 };
 
-static const char *memoryio[] = {
+static const char * const memoryio[] = {
 	"memory", "res.", "i/o", "generic"
 };
 
-static const char *nbextendederr[] = {
+static const char * const nbextendederr[] = {
 	"RAM ECC error",
 	"CRC error",
 	"Sync error",
@@ -103,7 +103,7 @@ static const char *nbextendederr[] = {
 	"L3 Cache LRU Error"
 };
 
-static const char *highbits[32] = {
+static const char * const highbits[32] = {
 	[31] = "valid",
 	[30] = "error overflow (multiple errors)",
 	[29] = "error uncorrected",
@@ -264,9 +264,8 @@ int parse_amd_k8_event(struct ras_events *ras, struct mce_event *e)
 	if (e->bank == 4) {
 		unsigned short exterrcode = (e->status >> 16) & 0x0f;
 
-		if (exterrcode == 5 && (e->status & (1ULL << 61))) {
+		if (exterrcode == 5 && (e->status & (1ULL << 61)))
 			return -1;
-		}
 	}
 
 	bank_name(e);

diff --git a/mce-amd.c b/mce-amd.c
@@ -86,10 +86,11 @@ void decode_amd_errcode(struct mce_event *e)
 			       "Uncorrected, software restartable error.");
 		strcpy(e->error_msg,
 		       "Uncorrected, software containable error.");
-	} else if (e->status & MCI_STATUS_DEFERRED)
+	} else if (e->status & MCI_STATUS_DEFERRED) {
 		strcpy(e->error_msg, "Deferred error, no action required.");
-	else
+	} else {
 		strcpy(e->error_msg, "Corrected error, no action required.");
+	}
 
 	if (!(e->status & MCI_STATUS_VAL))
 		mce_snprintf(e->mcistatus_msg, "MCE_INVALID");

diff --git a/mce-intel-broadwell-de.c b/mce-intel-broadwell-de.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-broadwell-epex.c b/mce-intel-broadwell-epex.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-dunnington.c b/mce-intel-dunnington.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-haswell.c b/mce-intel-haswell.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-i10nm.c b/mce-intel-i10nm.c
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <inttypes.h>
 #include <stdio.h>
@@ -299,18 +299,32 @@ static void i10nm_imc_misc(struct mce_event *e)
 	uint32_t eccmode = EXTRACT(e->misc, 59, 62);
 	uint32_t transient = EXTRACT(e->misc, 63, 63);
 
-	mce_snprintf(e->error_msg, "bank: 0x%x bankgroup: 0x%x row: 0x%x column: 0x%x", bank, bankgroup, row, column);
+	mce_snprintf(e->error_msg,
+		     "bank: 0x%x bankgroup: 0x%x row: 0x%x column: 0x%x",
+		     bank, bankgroup, row, column);
 	if (!transient && !EXTRACT(e->status, 61, 61))
 		mce_snprintf(e->error_msg, "failed device: 0x%x", fdevice);
 	mce_snprintf(e->error_msg, "rank: 0x%x subrank: 0x%x", rank, subrank);
 	mce_snprintf(e->error_msg, "ecc mode: ");
 	switch (eccmode) {
-	case 0: mce_snprintf(e->error_msg, "SDDC memory mode"); break;
-	case 1: mce_snprintf(e->error_msg, "SDDC"); break;
-	case 4: mce_snprintf(e->error_msg, "ADDDC memory mode"); break;
-	case 5: mce_snprintf(e->error_msg, "ADDDC"); break;
-	case 8: mce_snprintf(e->error_msg, "DDRT read"); break;
-	default: mce_snprintf(e->error_msg, "unknown"); break;
+	case 0:
+		mce_snprintf(e->error_msg, "SDDC memory mode");
+		break;
+	case 1:
+		mce_snprintf(e->error_msg, "SDDC");
+		break;
+	case 4:
+		mce_snprintf(e->error_msg, "ADDDC memory mode");
+		break;
+	case 5:
+		mce_snprintf(e->error_msg, "ADDDC");
+		break;
+	case 8:
+		mce_snprintf(e->error_msg, "DDRT read");
+		break;
+	default:
+		mce_snprintf(e->error_msg, "unknown");
+		break;
 	}
 	if (transient)
 		mce_snprintf(e->error_msg, "transient");
@@ -359,7 +373,7 @@ static enum banktype sapphire[32] = {
 	[13 ... 20]	= BT_IMC,
 };
 
-void i10nm_memerr_misc(struct mce_event *e, int *channel);
+static void i10nm_memerr_misc(struct mce_event *e, int *channel);
 
 void i10nm_decode_model(enum cputype cputype, struct ras_events *ras,
 			struct mce_event *e)
@@ -426,12 +440,24 @@ void i10nm_decode_model(enum cputype cputype, struct ras_events *ras,
 		mce_snprintf(e->error_msg, "MemCtrl: ");
 		f = EXTRACT(status, 16, 23);
 		switch (EXTRACT(status, 24, 31)) {
-		case 0: decode_bitfield(e, f, imc0); break;
-		case 1: decode_bitfield(e, f, imc1); break;
-		case 2: decode_bitfield(e, f, imc2); break;
-		case 4: decode_bitfield(e, f, imc4); break;
-		case 8: decode_bitfield(e, f, imc8); break;
-		case 0x10: decode_bitfield(e, f, imc10); break;
+		case 0:
+			decode_bitfield(e, f, imc0);
+			break;
+		case 1:
+			decode_bitfield(e, f, imc1);
+			break;
+		case 2:
+			decode_bitfield(e, f, imc2);
+			break;
+		case 4:
+			decode_bitfield(e, f, imc4);
+			break;
+		case 8:
+			decode_bitfield(e, f, imc8);
+			break;
+		case 0x10:
+			decode_bitfield(e, f, imc10);
+			break;
 		}
 		i10nm_imc_misc(e);
 		break;
@@ -464,7 +490,7 @@ void i10nm_decode_model(enum cputype cputype, struct ras_events *ras,
  * we can derive the channel from the bank number.
  * There can be four memory controllers with two channels each.
  */
-void i10nm_memerr_misc(struct mce_event *e, int *channel)
+static void i10nm_memerr_misc(struct mce_event *e, int *channel)
 {
 	uint64_t status = e->status;
 	unsigned int chan, imc;

diff --git a/mce-intel-ivb.c b/mce-intel-ivb.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-knl.c b/mce-intel-knl.c
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-nehalem.c b/mce-intel-nehalem.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-p4-p6.c b/mce-intel-p4-p6.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-sb.c b/mce-intel-sb.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-skylake-xeon.c b/mce-intel-skylake-xeon.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel-tulsa.c b/mce-intel-tulsa.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <string.h>
 #include <stdio.h>

diff --git a/mce-intel.c b/mce-intel.c
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ */
 
 #include <errno.h>
 #include <fcntl.h>
@@ -164,10 +164,15 @@ static void decode_memory_controller(struct mce_event *e, uint32_t status)
 static void decode_termal_bank(struct mce_event *e)
 {
 	if (e->status & 1) {
-		mce_snprintf(e->mcgstatus_msg, "Processor %d heated above trip temperature. Throttling enabled.", e->cpu);
-		mce_snprintf(e->user_action, "Please check your system cooling. Performance will be impacted");
+		mce_snprintf(e->mcgstatus_msg,
+			     "Processor %d heated above trip temperature. Throttling enabled.",
+			     e->cpu);
+		mce_snprintf(e->user_action,
+			     "Please check your system cooling. Performance will be impacted");
 	} else {
-		mce_snprintf(e->error_msg, "Processor %d below trip temperature. Throttling disabled", e->cpu);
+		mce_snprintf(e->error_msg,
+			     "Processor %d below trip temperature. Throttling disabled",
+			     e->cpu);
 	}
 }
 
@@ -209,9 +214,8 @@ static char *get_RRRR_str(uint8_t rrrr)
 	unsigned int i;
 
 	for (i = 0; i < ARRAY_SIZE(RRRR); i++) {
-		if (RRRR[i].value == rrrr) {
+		if (RRRR[i].value == rrrr)
 			return RRRR[i].str;
-		}
 	}
 
 	return "UNKNOWN";
@@ -281,8 +285,9 @@ static void decode_mca(struct mce_event *e, uint64_t track, int *ismemerr)
 	} else if (test_prefix(7, mca)) {
 		decode_memory_controller(e, mca);
 		*ismemerr = 1;
-	} else
+	} else {
 		mce_snprintf(e->mcastatus_msg, "Unknown Error %x", mca);
+	}
 }
 
 static void decode_tracking(struct mce_event *e, uint64_t track)