X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fapi.c;h=40f7812c0e686ac62d266dbbce4be6f63bfcc06e;hb=53b4680fceab9351fc87b8c5b34854733f5fdac0;hp=d0a63dc95cb2a9f8455ef56946e386807c27aa96;hpb=a68bf88e3a6ba0184f1d6aea4ce26b9a2950a513;p=libsigrok.git

diff --git a/hardware/saleae-logic16/api.c b/hardware/saleae-logic16/api.c
index d0a63dc9..40f7812c 100644
--- a/hardware/saleae-logic16/api.c
+++ b/hardware/saleae-logic16/api.c
@@ -428,7 +428,7 @@ static int cleanup(void)
 }
 
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *channel_group)
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
@@ -437,7 +437,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	int ret;
 	unsigned int i;
 
-	(void)channel_group;
+	(void)cg;
 
 	ret = SR_OK;
 	switch (key) {
@@ -482,14 +482,14 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 }
 
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *channel_group)
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	gdouble low, high;
 	int ret;
 	unsigned int i;
 
-	(void)channel_group;
+	(void)cg;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -525,7 +525,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *channel_group)
+		const struct sr_channel_group *cg)
 {
 	GVariant *gvar, *range[2];
 	GVariantBuilder gvb;
@@ -533,7 +533,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	unsigned int i;
 
 	(void)sdi;
-	(void)channel_group;
+	(void)cg;
 
 	ret = SR_OK;
 	switch (key) {