std_serial_dev_acquisition_stop(): Drop unneeded parameter.

src/hardware/agilent-dmm/api.c

@@ -246,7 +246,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/appa-55ii/api.c

@@ -255,7 +255,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi,
+	return std_serial_dev_acquisition_stop(sdi,
 			std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 

src/hardware/arachnid-labs-re-load-pro/api.c

@@ -376,7 +376,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi,
+	return std_serial_dev_acquisition_stop(sdi,
 		std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 

src/hardware/brymen-dmm/api.c

@@ -224,7 +224,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/cem-dt-885x/api.c

@@ -406,7 +406,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/center-3xx/api.c

@@ -228,7 +228,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi,
+	return std_serial_dev_acquisition_stop(sdi,
 			std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 

src/hardware/colead-slm/api.c

@@ -190,7 +190,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/fluke-dmm/api.c

@@ -280,7 +280,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/gmc-mh-1x-2x/api.c

@@ -521,7 +521,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	if (sdi && (devc = sdi->priv) && devc->limit_msec)
 		g_timer_stop(devc->elapsed_msec);
 
-	return std_serial_dev_acquisition_stop(sdi, sdi, dev_close,
+	return std_serial_dev_acquisition_stop(sdi, dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/kern-scale/api.c

@@ -213,7 +213,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/korad-kaxxxxp/api.c

@@ -410,7 +410,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	return std_serial_dev_acquisition_stop(sdi, sdi,
+	return std_serial_dev_acquisition_stop(sdi,
 		std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 

src/hardware/link-mso19/protocol.c

@@ -422,7 +422,7 @@ SR_PRIV int mso_receive_data(int fd, int revents, void *cb_data)
 
 	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
 		sr_info("Requested number of samples reached.");
-		sdi->driver->dev_acquisition_stop(sdi, sdi);
+		sdi->driver->dev_acquisition_stop(sdi);
 	}
 
 	return TRUE;

src/hardware/manson-hcs-3xxx/api.c

@@ -414,7 +414,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi,
+	return std_serial_dev_acquisition_stop(sdi,
 			std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 

src/hardware/mic-985xx/api.c

@@ -236,7 +236,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/motech-lps-30x/api.c

@@ -831,7 +831,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	if (sdi && (devc = sdi->priv) && devc->limit_msec)
 		g_timer_stop(devc->elapsed_msec);
 
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/norma-dmm/api.c

@@ -281,7 +281,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	if (sdi && (devc = sdi->priv) && devc->limit_msec)
 		g_timer_stop(devc->elapsed_msec);
 
-	return std_serial_dev_acquisition_stop(sdi, sdi, dev_close,
+	return std_serial_dev_acquisition_stop(sdi, dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/serial-dmm/api.c

@@ -241,7 +241,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/hardware/teleinfo/api.c

@@ -223,7 +223,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi,
+	return std_serial_dev_acquisition_stop(sdi,
 			std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 

src/hardware/tondaj-sl-814/api.c

@@ -180,7 +180,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 

src/lcr/es51919.c

@@ -929,6 +929,6 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
 
 SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi,
+	return std_serial_dev_acquisition_stop(sdi,
 			std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }

src/libsigrok-internal.h

@@ -852,7 +852,7 @@ SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
 #ifdef HAVE_LIBSERIALPORT
 SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi);
 SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
-		void *cb_data, dev_close_callback dev_close_fn,
+		dev_close_callback dev_close_fn,
 		struct sr_serial_dev_inst *serial, const char *prefix);
 #endif
 SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,

src/std.c

@@ -211,7 +211,7 @@ SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi)
  * @retval SR_ERR Other errors.
  */
 SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
-			void *cb_data, dev_close_callback dev_close_fn,
+			dev_close_callback dev_close_fn,
 			struct sr_serial_dev_inst *serial, const char *prefix)
 {
 	int ret;
@@ -238,7 +238,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
 		return ret;
 	}
 
-	std_session_send_df_end(cb_data, prefix);
+	std_session_send_df_end(sdi, prefix);
 
 	return SR_OK;
 }