X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fapi.c;h=2bf20627a02d1381cb7bc3c3a9e045d489bad6d0;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=b8e694653ee0f66a017575a8d0feb244067a5bf5;hpb=6525d819eef098a43b1f438ae4af50e67c9c4335;p=libsigrok.git

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index b8e69465..2bf20627 100644
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -57,11 +57,6 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
 	},
 };
 
-static int dev_clear(int idx)
-{
-	return std_dev_clear(mic_devs[idx].di, NULL);
-}
-
 static int init(struct sr_context *sr_ctx, int idx)
 {
 	return std_init(sr_ctx, mic_devs[idx].di, LOG_PREFIX);
@@ -150,11 +145,6 @@ static GSList *dev_list(int idx)
 	return ((struct drv_context *)(mic_devs[idx].di->context))->instances;
 }
 
-static int cleanup(int idx)
-{
-	return dev_clear(idx);
-}
-
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -244,18 +234,12 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 #define HW_INIT(X) \
 static int init_##X(struct sr_dev_driver *di, struct sr_context *sr_ctx) { \
 	(void)di; return init(sr_ctx, X); }
-#define HW_CLEANUP(X) \
-static int cleanup_##X(const struct sr_dev_driver *di) { \
-	(void)di; return cleanup(X); }
 #define HW_SCAN(X) \
 static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \
 	(void)di; return scan(options, X); }
 #define HW_DEV_LIST(X) \
 static GSList *dev_list_##X(const struct sr_dev_driver *di) { \
 	(void)di; return dev_list(X); }
-#define HW_DEV_CLEAR(X) \
-static int dev_clear_##X(const struct sr_dev_driver *di) { \
-	(void)di; return dev_clear(X); }
 #define HW_CONFIG_LIST(X) \
 static int config_list_##X(uint32_t key, GVariant **data, \
 const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { \
@@ -267,10 +251,8 @@ static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi \
 /* Driver structs and API function wrappers */
 #define DRV(ID, ID_UPPER, NAME, LONGNAME) \
 HW_INIT(ID_UPPER) \
-HW_CLEANUP(ID_UPPER) \
 HW_SCAN(ID_UPPER) \
 HW_DEV_LIST(ID_UPPER) \
-HW_DEV_CLEAR(ID_UPPER) \
 HW_CONFIG_LIST(ID_UPPER) \
 HW_DEV_ACQUISITION_START(ID_UPPER) \
 SR_PRIV struct sr_dev_driver ID##_driver_info = { \
@@ -278,10 +260,9 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
 	.longname = LONGNAME, \
 	.api_version = 1, \
 	.init = init_##ID_UPPER, \
-	.cleanup = cleanup_##ID_UPPER, \
+	.cleanup = std_cleanup, \
 	.scan = scan_##ID_UPPER, \
 	.dev_list = dev_list_##ID_UPPER, \
-	.dev_clear = dev_clear_##ID_UPPER, \
 	.config_get = NULL, \
 	.config_set = config_set, \
 	.config_list = config_list_##ID_UPPER, \