BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Various drivers: Drop some unneeded lines.

This commit is contained in:
Uwe Hermann 2014-03-25 21:35:31 +01:00
parent 0bcfc9dcd8
commit 8bd3daa48a
5 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/cem-dt-885x/api.c
View File

@ -405,8 +405,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{ {
(void)cb_data;
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;

9
hardware/gmc-mh-1x-2x/api.c
View File

@ -428,14 +428,10 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
int ret; int ret;
struct dev_context *devc; struct dev_context *devc;
(void)sdi;
(void)data;
(void)cg; (void)cg;
ret = SR_OK; ret = SR_OK;
(void)cg;
if (!sdi || !(devc = sdi->priv)) if (!sdi || !(devc = sdi->priv))
return SR_ERR_ARG; return SR_ERR_ARG;
@ -447,7 +443,6 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
case SR_CONF_LIMIT_MSEC: case SR_CONF_LIMIT_MSEC:
*data = g_variant_new_uint64(devc->limit_msec); *data = g_variant_new_uint64(devc->limit_msec);
break; break;
case SR_CONF_POWER_OFF: case SR_CONF_POWER_OFF:
*data = g_variant_new_boolean(FALSE); *data = g_variant_new_boolean(FALSE);
break; break;
@ -481,8 +476,6 @@ static int config_list_common(int key, GVariant **data, const struct sr_dev_inst
static int config_list_sm(int key, GVariant **data, const struct sr_dev_inst *sdi, static int config_list_sm(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg) const struct sr_channel_group *cg)
{ {
(void)sdi;
switch (key) { switch (key) {
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
@ -499,8 +492,6 @@ static int config_list_sm(int key, GVariant **data, const struct sr_dev_inst *sd
static int config_list_bd(int key, GVariant **data, const struct sr_dev_inst *sdi, static int config_list_bd(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg) const struct sr_channel_group *cg)
{ {
(void)sdi;
switch (key) { switch (key) {
case SR_CONF_DEVICE_OPTIONS: case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,

3
hardware/norma-dmm/api.c
View File

@ -250,9 +250,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
(void)sdi;
(void)cb_data;
if (!sdi || !cb_data || !(devc = sdi->priv)) if (!sdi || !cb_data || !(devc = sdi->priv))
return SR_ERR_BUG; return SR_ERR_BUG;

2
hardware/uni-t-dmm/api.c
View File

@ -257,8 +257,6 @@ static int dev_open(struct sr_dev_inst *sdi, int dmm)
static int dev_close(struct sr_dev_inst *sdi) static int dev_close(struct sr_dev_inst *sdi)
{ {
(void)sdi;
/* TODO */ /* TODO */
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;

1
hardware/uni-t-ut32x/protocol.c
View File

@ -203,6 +203,7 @@ SR_PRIV int uni_t_ut32x_handle_events(int fd, int revents, void *cb_data)
(void)fd; (void)fd;
(void)revents; (void)revents;
drvc = di->priv; drvc = di->priv;
if (!(sdi = cb_data)) if (!(sdi = cb_data))