X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=device.c;h=9b68eb0b28a6db3cb34b76524ba151ac004f57a4;hp=72cba33873fba72fe74a112df3d05ec4aebfad99;hb=66410a8617185da7abf4ca21da99e934b22351bb;hpb=af1c793dfe27b622a48dd213c4d42bc012e81965

diff --git a/device.c b/device.c
index 72cba338..9b68eb0b 100644
--- a/device.c
+++ b/device.c
@@ -205,16 +205,12 @@ int sr_device_probe_clear(struct sr_device *device, int probenum)
 	}
 
 	/* If the probe has a name, remove it. */
-	if (p->name) {
-		g_free(p->name);
-		p->name = NULL;
-	}
+	g_free(p->name);
+	p->name = NULL;
 
 	/* If the probe has a trigger, remove it. */
-	if (p->trigger) {
-		g_free(p->trigger);
-		p->trigger = NULL;
-	}
+	g_free(p->trigger);
+	p->trigger = NULL;
 
 	return SR_OK;
 }
@@ -351,8 +347,7 @@ int sr_device_probe_name(struct sr_device *device, int probenum,
 	/* TODO: Sanity check on 'name'. */
 
 	/* If the probe already has a name, kill it first. */
-	if (p->name)
-		g_free(p->name);
+	g_free(p->name);
 
 	p->name = g_strdup(name);
 
@@ -387,7 +382,7 @@ int sr_device_trigger_clear(struct sr_device *device)
 	for (pnum = 1; pnum <= g_slist_length(device->probes); pnum++) {
 		p = sr_device_probe_find(device, pnum);
 		/* TODO: Silently ignore probes which cannot be found? */
-		if (p && p->trigger) {
+		if (p) {
 			g_free(p->trigger);
 			p->trigger = NULL;
 		}
@@ -433,8 +428,7 @@ int sr_device_trigger_set(struct sr_device *device, int probenum,
 	}
 
 	/* If the probe already has a trigger, kill it first. */
-	if (p->trigger)
-		g_free(p->trigger);
+	g_free(p->trigger);
 
 	p->trigger = g_strdup(trigger);