]> sigrok.org Git - libsigrok.git/commitdiff
pce-322a: Pass driver dev_close callback std_serial_dev_acquisition_stop()
authorLars-Peter Clausen <redacted>
Sat, 28 May 2016 11:45:54 +0000 (13:45 +0200)
committerUwe Hermann <redacted>
Tue, 31 May 2016 13:54:52 +0000 (15:54 +0200)
All drivers with the exception of pce-322a pass their dev_close callback to
std_serial_dev_acquisition_stop(). The pce-322a passes std_serial_dev_close()
which is also called from its dev_close() callback and replicates the other
functionality of its dev_close() callback directly in
std_serial_dev_acquisition_stop().

Refactor this to pass the dev_close callback function directly to
std_serial_dev_acquisition_stop(). This makes sure that the driver is
consistent with other drivers and also removes duplicated code.

Signed-off-by: Lars-Peter Clausen <redacted>
src/hardware/pce-322a/api.c

index d03b34a78451fa443a47e0480bf724690a6670c2..57f49bf6e4dd6219ba76b92eb345e05f51529550 100644 (file)
@@ -321,9 +321,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       pce_322a_disconnect(sdi);
-
-       return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
+       return std_serial_dev_acquisition_stop(sdi, dev_close,
                        sdi->conn, LOG_PREFIX);
 }