X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fat91sam4.c;h=4ec2ee89ecec7393f698885f59507a8493ffda63;hb=f24a283ac7765df6f09694a4cee99150cb645ac1;hp=b45cf071d82c451c2d10f2521a6b83aca0bf56b0;hpb=3d135a5c70db67ed13cc93eeab0b700f6ef8a412;p=openocd.git

diff --git a/src/flash/nor/at91sam4.c b/src/flash/nor/at91sam4.c
index b45cf071d8..4ec2ee89ec 100644
--- a/src/flash/nor/at91sam4.c
+++ b/src/flash/nor/at91sam4.c
@@ -2318,7 +2318,7 @@ static struct sam4_chip *target2sam4(struct target *target)
 {
 	struct sam4_chip *chip;
 
-	if (target == NULL)
+	if (!target)
 		return NULL;
 
 	chip = all_sam4_chips;
@@ -2611,7 +2611,7 @@ static int sam4_get_details(struct sam4_bank_private *private)
 		else
 			details++;
 	}
-	if (details->name == NULL) {
+	if (!details->name) {
 		LOG_ERROR("SAM4 ChipID 0x%08x not found in table (perhaps you can ID this chip?)",
 			(unsigned int)(private->chip->cfg.CHIPID_CIDR));
 		/* Help the victim, print details about the chip */
@@ -2662,7 +2662,7 @@ static int sam4_info(struct flash_bank *bank, struct command_invocation *cmd)
 	int k = bank->size / 1024;
 
 	private = get_sam4_bank_private(bank);
-	if (private == NULL)
+	if (!private)
 		return ERROR_FAIL;
 
 	command_print_sameline(cmd, "%s bank %d: %d kB at " TARGET_ADDR_FMT,
@@ -2715,9 +2715,9 @@ static int sam4_probe(struct flash_bank *bank)
 		}
 	}
 
-	if (bank->sectors == NULL) {
+	if (!bank->sectors) {
 		bank->sectors = calloc(private->nsectors, (sizeof((bank->sectors)[0])));
-		if (bank->sectors == NULL) {
+		if (!bank->sectors) {
 			LOG_ERROR("No memory!");
 			return ERROR_FAIL;
 		}
@@ -3092,7 +3092,7 @@ COMMAND_HANDLER(sam4_handle_info_command)
 	int r;
 
 	/* bank0 must exist before we can do anything */
-	if (chip->details.bank[0].bank == NULL) {
+	if (!chip->details.bank[0].bank) {
 		x = 0;
 need_define:
 		command_print(CMD,
@@ -3118,7 +3118,7 @@ need_define:
 		if (!(chip->details.bank[x].present))
 			continue;
 
-		if (chip->details.bank[x].bank == NULL)
+		if (!chip->details.bank[x].bank)
 			goto need_define;
 
 		if (chip->details.bank[x].probed)
@@ -3153,7 +3153,7 @@ COMMAND_HANDLER(sam4_handle_gpnvm_command)
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	if (chip->details.bank[0].bank == NULL) {
+	if (!chip->details.bank[0].bank) {
 		command_print(CMD, "Bank0 must be defined first via: flash bank %s ...",
 			at91sam4_flash.name);
 		return ERROR_FAIL;
@@ -3173,7 +3173,7 @@ COMMAND_HANDLER(sam4_handle_gpnvm_command)
 			who = -1;
 			break;
 		case 2:
-			if ((0 == strcmp(CMD_ARGV[0], "show")) && (0 == strcmp(CMD_ARGV[1], "all")))
+			if ((strcmp(CMD_ARGV[0], "show") == 0) && (strcmp(CMD_ARGV[1], "all") == 0))
 				who = -1;
 			else {
 				uint32_t v32;
@@ -3183,7 +3183,7 @@ COMMAND_HANDLER(sam4_handle_gpnvm_command)
 			break;
 	}
 
-	if (0 == strcmp("show", CMD_ARGV[0])) {
+	if (strcmp("show", CMD_ARGV[0]) == 0) {
 		if (who == -1) {
 showall:
 			r = ERROR_OK;
@@ -3211,10 +3211,10 @@ showall:
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	if (0 == strcmp("set", CMD_ARGV[0]))
+	if (strcmp("set", CMD_ARGV[0]) == 0)
 		r = flashd_set_gpnvm(&(chip->details.bank[0]), who);
-	else if ((0 == strcmp("clr", CMD_ARGV[0])) ||
-		 (0 == strcmp("clear", CMD_ARGV[0])))			/* quietly accept both */
+	else if ((strcmp("clr", CMD_ARGV[0]) == 0) ||
+		 (strcmp("clear", CMD_ARGV[0]) == 0))			/* quietly accept both */
 		r = flashd_clr_gpnvm(&(chip->details.bank[0]), who);
 	else {
 		command_print(CMD, "Unknown command: %s", CMD_ARGV[0]);