X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fteleinfo%2Fapi.c;h=5e1dfba1acd4b8692d6edac5730906f86a8d9dd4;hb=8656a71790133d4de42252a1e75b4209c03b4983;hp=00d058aa26f87d16f0c7360f5841b26bfac93bfe;hpb=f57d8ffe66612a1fdc20ed09c222f8ea59bd84d4;p=libsigrok.git

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 00d058aa..5e1dfba1 100644
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -74,8 +74,8 @@ static GSList *scan(GSList *options)
 	if (!serialcomm)
 		serialcomm = "1200/7e1";
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
+
 	if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
 		return NULL;
 
@@ -103,55 +103,41 @@ static GSList *scan(GSList *options)
 	sdi->priv = devc;
 	sdi->driver = di;
 
-	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P")))
-		goto scan_cleanup;
+	ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P");
 	sdi->channels = g_slist_append(sdi->channels, ch);
 
 	if (devc->optarif == OPTARIF_BASE) {
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "BASE")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "BASE");
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	} else if (devc->optarif == OPTARIF_HC) {
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HP")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HP");
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HC")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HC");
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	} else if (devc->optarif == OPTARIF_EJP) {
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HN")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HN");
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPM")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPM");
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	} else if (devc->optarif == OPTARIF_BBR) {
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJB")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJB");
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJW")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJW");
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJR")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJR");
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJB")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJB");
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJW")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJW");
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJR")))
-			goto scan_cleanup;
+		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJR");
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	}
 
-	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "IINST")))
-		goto scan_cleanup;
+	ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "IINST");
 	sdi->channels = g_slist_append(sdi->channels, ch);
 
-	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "PAPP")))
-		goto scan_cleanup;
+	ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "PAPP");
 	sdi->channels = g_slist_append(sdi->channels, ch);
 
 	drvc->instances = g_slist_append(drvc->instances, sdi);