std_init(): Drop check if pass in driver is non-NULL

std_init() checks if the pass in struct sr_dev_driver is non-NULL and
prints a error message and returns an error if it is NULL.

std_init() is exclusively called from driver init() callbacks for which the
core already checks if the struct sr_dev_driver is non-NULL before invoking
the callback. This means the check in std_init() will always evaluate to
false. So drop this check.

This also means that the prefix parameter that was used in the error
message is no longer needed and can be removed from the function signature.
Doing so will make the std_init() function signature identical to the
init() callback signature which will allow to directly use it as such.

Signed-off-by: Lars-Peter Clausen <redacted>

diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index da6b84ca4b1492f62723ac321e0afd6994d036bd..b7e4a6bdcf0ac8ba6f6a75c55c746c998f8dab14 100644 (file)
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -74,7 +74,7 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c
index 6163f2df1e5420698d3f4799e8604844347ad4e9..14b8ea91903b4217d2748e08aa655f06747205de 100644 (file)
--- a/src/hardware/appa-55ii/api.c
+++ b/src/hardware/appa-55ii/api.c
@@ -46,7 +46,7 @@ SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index 4543a025a65aab794d47b28dfd1cd60543fe72c5..4bbbf243054443c65adb1a0ce25b6dd47788fe30 100644 (file)
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -60,7 +60,7 @@ SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index cb5eeca4b110b07e52b5000414119549ef04bed2..cb61b92b2fcac16beea70fbe1b47af33ebf3732c 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -65,7 +65,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index e46bff41aef5fbf30c904c343d57ac11fe95339e..fea793a1d99ccfb4da8231465454e292396a0d2f 100644 (file)
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -79,7 +79,7 @@ SR_PRIV struct sr_dev_driver atten_pps3203_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index 49cf96aed5c3ae66f72233966de57c9610540b6a..9103aeb15a1482d4fd14df89410b9d7496f9289c 100644 (file)
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -55,7 +55,7 @@ static const uint64_t samplerates[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index e8309bd258f80c4a565b4ad9cd81c75c9b3135a0..e28350c1efb146c91887dcfeee27d537bbaa5f0b 100644 (file)
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -62,7 +62,7 @@ static const uint64_t samplerates[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static struct dev_context *beaglelogic_devc_alloc(void)

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index cf41e90d4cbb75648ded205c47acbc365a29b579..88a9a5aac8483589f39c68d831f89d7fee636194 100644 (file)
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -37,7 +37,7 @@ SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index 28e2a5ba4528b065cce6fd54f10e7b7880382c97..9aad650441066ab56d467a6276730dca8e02c982 100644 (file)
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -37,7 +37,7 @@ static struct sr_dev_driver *di = &brymen_bm857_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *brymen_scan(const char *conn, const char *serialcomm)

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index 40b8c6d8b9622e6f44d0bf3dd97c8b8464c487c3..c7816ba60a17050fd224eb9a55bcc73214c618e8 100644 (file)
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -73,7 +73,7 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c
index 6c0e08904a9ea74810e14bb760466be7585cb1da..c78825ab0b2727f71bdd6fa8a7a5f9ef01acfd58 100644 (file)
--- a/src/hardware/center-3xx/api.c
+++ b/src/hardware/center-3xx/api.c
@@ -58,7 +58,7 @@ SR_PRIV const struct center_dev_info center_devs[] = {
 
 static int init(struct sr_context *sr_ctx, int idx)
 {
-       return std_init(center_devs[idx].di, sr_ctx, LOG_PREFIX);
+       return std_init(center_devs[idx].di, sr_ctx);
 }
 
 static GSList *center_scan(const char *conn, const char *serialcomm, int idx)

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index fa28d82e014abc65344fe8487039711855cfc26b..322ac3b0b37b5dcb78c6b9b013af7b6af9959baa 100644 (file)
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -66,7 +66,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static int add_device(int model, struct libusb_device_descriptor *des,

diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index 7cbd2e671b664433e3b5779b06d9709cbc41527a..56b3ead78578abd6fc76ec9be76c89994beaad55 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -46,7 +46,7 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index 357dad94563da385addc991b8a475b4b5f12579a..16c4157ac1de5eaecebfe3c274c03bb42258c06b 100644 (file)
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -43,7 +43,7 @@ SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 1587d5e7b8c5c64eaf45c324508a276fd058985b..3df4eccbefc7fef1b88eaebfa6eead9a544425fb 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -181,7 +181,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)

diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 7a832022789adb9fe47cec018f8ad91faf37b519..3f2a54a1b9a7aba7d2af65d142e567948f2ca247 100644 (file)
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -41,7 +41,7 @@ SR_PRIV struct sr_dev_driver deree_de5000_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 8d4ed2bb32c96b277ae22b2c89b70ee632083844..cd34c181b91ae6e6f30c36a61584a94649d54d0f 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -61,7 +61,7 @@ static const struct flukedmm_profile supported_flukedmm[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,

diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index c258be14e2da2c66526ceea01d6aab8ad8ebc1c6..2a64729e25722fb7910c4d8ad3f0d34243ba4ec7 100644 (file)
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -86,7 +86,7 @@ static const struct ftdi_chip_desc *chip_descs[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSList **devices)

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index e56f152f5ff191069020fc3cdb22c382d4b3721d..6f6c53fb09c215b68e3f7370aa7c99d47c25e145 100644 (file)
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -183,7 +183,7 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 67ad40d34a5d1c6a531830810b7524b075c254eb..de3e9ea527d33de921d386dbb0bfadca1bb4a44e 100644 (file)
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -68,7 +68,7 @@ static const uint32_t devopts_bd[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 /**

diff --git a/src/hardware/gwinstek-gds-800/api.c b/src/hardware/gwinstek-gds-800/api.c
index 5e4a67fc3d2b0d14fe916b15f0258b7d10e39362..bd9461e823b3bce670bef3067791afa687bb47d9 100644 (file)
--- a/src/hardware/gwinstek-gds-800/api.c
+++ b/src/hardware/gwinstek-gds-800/api.c
@@ -35,7 +35,7 @@ SR_PRIV struct sr_dev_driver gwinstek_gds_800_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index f75f55e07a7c89054a7cbcb24e14ff51921e86ba..1e60a34aba99696470967da10af091a49f85e9fe 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -49,7 +49,7 @@ enum {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static int check_manufacturer(const char *manufacturer)

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index ab866a47753268e9a74c8af22018d7a4abd61234..838805dbfda7e9c08cf466ebe0b2c938896059f3 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -165,7 +165,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 6162d5c13f022b34ddcbf6501bae618c01fab0b2..c571573356fc2ebdbc72c56c93390acb4f8fee04 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -256,7 +256,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/hp-3457a/api.c b/src/hardware/hp-3457a/api.c
index a5ff7d98db0ab72a1d2627e4026fb0b7dcac36a6..2d05f29a89375a8fd3fa99b27afa2b9404c04438 100644 (file)
--- a/src/hardware/hp-3457a/api.c
+++ b/src/hardware/hp-3457a/api.c
@@ -168,7 +168,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index eb2246f61a6a8465dfd1cb7b58ba386efc80524a..e628c771d72ba64a2616404e043d3ad0a73e82f6 100644 (file)
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -106,7 +106,7 @@ static const uint8_t coupling_map[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan_port(GSList *devices, struct sr_dev_driver *di,

diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c
index 6a8e095636eed82035afaf17ccb752a71cfcbb83..7f03a59a7d9c63ebf848ea702c9d7515fe81fdeb 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -56,7 +56,7 @@ SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/ikalogic-scanaplus/api.c b/src/hardware/ikalogic-scanaplus/api.c
index 898d7a3a574bcc377dab5e52b2fc640e0f15e503..e5b6cec8c0345f0a710bbc7efd2c8909d6b30c79 100644 (file)
--- a/src/hardware/ikalogic-scanaplus/api.c
+++ b/src/hardware/ikalogic-scanaplus/api.c
@@ -67,7 +67,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c
index 309b1b6408667096285d233a05eb9863e1d55d1d..6a64b8f8e20bb622fb45c75c66ab90cc5ea6daea 100644 (file)
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -65,7 +65,7 @@ SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static int scan_kecheng(struct sr_dev_driver *di,

diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index ef954306ee741153108b7b9e33b41fa753646b6c..ed55687f299ac14c79012c4a86277b7a42bc63ef 100644 (file)
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -38,7 +38,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 9a2b916946cbd3794a222f323d2caeb64205a54f..6f4ad65a04491ac4f35836f2f4915d9fb8f0447f 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -66,7 +66,7 @@ SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index ce61f46229ecd8b5f8fcc365519049f348ba183b..78eab70500f84b2177e07d49e2ec0f959a4abc1d 100644 (file)
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -40,7 +40,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index 8e58bd04ac6f79ad2f282eea84f6b780ff86828a..303309b757f9099833809e952d7798472bf5ada0 100644 (file)
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -75,7 +75,7 @@ SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static struct sr_dev_inst *create_device(struct sr_dev_driver *di,

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index e25c5578f72ba4fa5a89857c763565b99c779626..ff511730cc0db9e0215aacfdbb7e0f1cc69b3cbe 100644 (file)
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -87,7 +87,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index 4ce5909b164fae829c9467d3fbf4114387cd2d49..30180d3b15bae25d8ec14eba65e70a0fdd58f50c 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -77,7 +77,7 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 59f9c7ff960d67ef34968df8c479ed9d702e1660..f8d615d18f92671ff4b186d8c7b86b0d1ecf9ead 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -113,7 +113,7 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index f6d77f0515f0dc7dd386aaa13bac6167a3145c5c..70914e1cd2c94379d3befe7762c72293701242a0 100644 (file)
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -59,7 +59,7 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
 
 static int init(struct sr_context *sr_ctx, int idx)
 {
-       return std_init(mic_devs[idx].di, sr_ctx, LOG_PREFIX);
+       return std_init(mic_devs[idx].di, sr_ctx);
 }
 
 static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 8d87da0280cf47ffd1210943ddd7eb59d52a6c4d..d8aceb50fa9d21cbfc9225949d11c49ab9d44553 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -135,7 +135,7 @@ static const struct lps_modelspec models[] = {
 
 static int init_lps301(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 /** Send command to device with va_list.

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index fa32fa65c669d8bd76d11e18cb462b724dbfa15e..ad099c9370cb2550021105a7cfecb3a23d8b44c0 100644 (file)
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -67,7 +67,7 @@ static const char *get_typestr(int type, struct sr_dev_driver *drv)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *drv, GSList *options)

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index 96a7cc0986023bf7326b3d19ea3e94ecbd22e168..bee4c3a82df19eef94a65b3d831e20f0cd0fb022 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -89,7 +89,7 @@ SR_PRIV struct sr_dev_driver ols_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index c4d0cf370ec4d7559b00a0bf1bccdc95d30a7a1e..6a51986f1ae139dd30b87da373af81e1577bffd2 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -79,7 +79,7 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 53208a7237aa24adfdac96142c6ca7f36d5db07e..ce8fa116734318e1d22b9285117b0df29076304a 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -274,7 +274,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c
index 5c587effd555eca90420ab16c100a3e07c7f1a79..5ca534b1ff4b28c77b16aef6b72e3245ec9ad697 100644 (file)
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -97,7 +97,7 @@ static const uint64_t samplerates[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static gboolean check_conf_profile(libusb_device *dev)

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 01ae50cce66aa70e9c6b1a0da6b1ec163f1cf4a7..c8904b674e30c69d06f1c45ebb5647292cce4f73 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -43,7 +43,7 @@ static const struct pps_channel_instance pci[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index b16caa9abff77771dd64ece7363b16189cefb0fb..860062ad510f34297d9299b4458a8c10b3cf3603 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -43,7 +43,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 33992ffef0ee268202c1c462888eb902f9dfaa48..a2e29933c0c61f0fb1559b7093da05a422b11424 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -65,7 +65,7 @@ static const char *const signal_edge_names[] = {
  */
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 /* Create a new sigrok device instance for the indicated LWLA model.

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index a99fd37f6ea86634999e784964bf4bb9518aeadd..d9445e17b7f5a016d8a2d7fbfbb3ac93c5c852e9 100644 (file)
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -40,7 +40,7 @@ SR_PRIV struct sr_dev_driver teleinfo_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index 79a11b430bd43c79ff86a67d7921b8dfd9e90842..daf4965c37e1ff062a01cd963befb756b65842b8 100644 (file)
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -45,7 +45,7 @@ static const struct testo_model models[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index 7c9c1bf85e8b7ef0011e731e811896efbeaed5ef..9b31e1d6e0ce729c986ff7f383f7472bd6ae161f 100644 (file)
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -43,7 +43,7 @@ SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 1c1cd300507100f95f52f13d5e4f15e499ec1d9e..6e8663e501e7f6bba03b03fa65baecc13ac76388 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -48,7 +48,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c
index 5e8be27ba085c034a8f4c9ddd0f332c2afd1ca34..67a15518797705afc8ce11918349049f09cb6c84 100644 (file)
--- a/src/hardware/uni-t-ut32x/api.c
+++ b/src/hardware/uni-t-ut32x/api.c
@@ -41,7 +41,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info;
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index c00c29fb4654adc1cfdb838e56f25e7f02623c4b..35571549eaafc4c9121fee945b7bd8d0af05d3d5 100644 (file)
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -52,7 +52,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 547179d0082bf0dff6ce0da6bb1357da75b275bb..91eea3e0ab46e7b47298f8681403cc0e92bc0062 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -65,7 +65,7 @@ enum {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index 32c868996ee2ec3676cf7a439191b8cc1a919b94..a50ea3f2cae298562abee4c0abc76f01ba5f4006 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -157,7 +157,7 @@ SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 328e17078f32b77faa91a6643e8166e6b2749dc3..588d09080e52db997485f0a6834164efbf9c4bfd 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -859,8 +859,7 @@ SR_PRIV int sr_analog_init(struct sr_datafeed_analog *analog,
 typedef int (*dev_close_callback)(struct sr_dev_inst *sdi);
 typedef void (*std_dev_clear_callback)(void *priv);
 
-SR_PRIV int std_init(struct sr_dev_driver *di, struct sr_context *sr_ctx,
-               const char *prefix);
+SR_PRIV int std_init(struct sr_dev_driver *di, struct sr_context *sr_ctx);
 SR_PRIV int std_cleanup(const struct sr_dev_driver *di);
 #ifdef HAVE_LIBSERIALPORT
 SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi);

diff --git a/src/session_driver.c b/src/session_driver.c
index c7f2b3d72692fe9d832d46c2a8295fafad5248a0..e0dd3fcb8dc672ca3a87df1cacdd735429185c0e 100644 (file)
--- a/src/session_driver.c
+++ b/src/session_driver.c
@@ -208,7 +208,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(di, sr_ctx, LOG_PREFIX);
+       return std_init(di, sr_ctx);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)

diff --git a/src/std.c b/src/std.c
index 8f6f3786339472dd06136ceab46368ea3a0e0764..a03e509c732b4c0693ef6ee69638bffa9acc236a 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -41,20 +41,13 @@
  *
  * @param di The driver instance to use.
  * @param sr_ctx The libsigrok context to assign.
- * @param[in] prefix A driver-specific prefix string used for log messages.
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
  */
-SR_PRIV int std_init(struct sr_dev_driver *di, struct sr_context *sr_ctx,
-                    const char *prefix)
+SR_PRIV int std_init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
        struct drv_context *drvc;
 
-       if (!di) {
-               sr_err("%s: Invalid driver, cannot initialize.", prefix);
-               return SR_ERR_ARG;
-       }
-
        drvc = g_malloc0(sizeof(struct drv_context));
        drvc->sr_ctx = sr_ctx;
        drvc->instances = NULL;