X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fapi.c;h=b3fc1321fb70d6479245830a95edc47b1f06c4d3;hb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;hp=15c43b1b95fa21c155165983e832754e67a2e727;hpb=c01bf34ca264b268fee2e71ab918c71d28dc3018;p=libsigrok.git

diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c
index 15c43b1b..b3fc1321 100644
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -63,11 +63,6 @@ static const char *data_sources[] = {
 
 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(sr_ctx, di, LOG_PREFIX);
-}
-
 static int scan_kecheng(struct sr_dev_driver *di,
 		struct sr_usb_dev_inst *usb, char **model)
 {
@@ -163,15 +158,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct sr_dev_driver *di = sdi->driver;
-	struct drv_context *drvc;
+	struct drv_context *drvc = di->context;
 	struct sr_usb_dev_inst *usb;
 	int ret;
 
-	if (!(drvc = di->context)) {
-		sr_err("Driver was not initialized.");
-		return SR_ERR;
-	}
-
 	usb = sdi->conn;
 
 	if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
@@ -193,15 +183,9 @@ static int dev_open(struct sr_dev_inst *sdi)
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-	struct sr_dev_driver *di = sdi->driver;
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
 
-	if (!di->context) {
-		sr_err("Driver was not initialized.");
-		return SR_ERR;
-	}
-
 	usb = sdi->conn;
 
 	if (!usb->devhdl)
@@ -274,7 +258,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
-	struct sr_dev_driver *di = sdi->driver;
 	struct dev_context *devc;
 	uint64_t p, q;
 	unsigned int i;
@@ -286,11 +269,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	if (!di->context) {
-		sr_err("Driver was not initialized.");
-		return SR_ERR;
-	}
-
 	devc = sdi->priv;
 	ret = SR_OK;
 	switch (key) {
@@ -529,7 +507,7 @@ SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info = {
 	.name = "kecheng-kc-330b",
 	.longname = "Kecheng KC-330B",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,