X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstd.c;h=7cd2313129456605a970924232b0ec990a8e04a7;hb=1b38775baa3016fb4d613c971dce5a4f26cacb7b;hp=218f8f3f2f9490a735801125aecf4ecc97a37739;hpb=15f96409dc54fd2ef784c59156daedd9acfa78ed;p=libsigrok.git diff --git a/src/std.c b/src/std.c index 218f8f3f..7cd23131 100644 --- a/src/std.c +++ b/src/std.c @@ -203,17 +203,13 @@ SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi) * * @param sdi The device instance for which acquisition should stop. * Must not be NULL. - * @param cb_data Opaque 'cb_data' pointer. Must not be NULL. - * @param dev_close_fn Function pointer to the driver's dev_close(). - * Must not be NULL. * * @retval SR_OK Success. * @retval SR_ERR_ARG Invalid arguments. * @retval SR_ERR_DEV_CLOSED Device is closed. * @retval SR_ERR Other errors. */ -SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi, - dev_close_callback dev_close_fn) +SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi) { struct sr_serial_dev_inst *serial = sdi->conn; const char *prefix = sdi->driver->name; @@ -231,7 +227,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi, return ret; } - if ((ret = dev_close_fn(sdi)) < 0) { + if ((ret = sdi->driver->dev_close(sdi)) < 0) { sr_err("%s: Failed to close device: %d.", prefix, ret); return ret; }