Shorten/simplify hw_dev_list() implementations.

[libsigrok.git] / hardware / demo / demo.c

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 60a511f2532f6d4321d2fbf1ff225c2affd0b212..248ee11eabb53756dd3c697ff221f080448b7ce7 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -94,10 +94,10 @@ static const int hwcaps[] = {
 };
 
 static const struct sr_samplerates samplerates = {
-       SR_HZ(1),
-       SR_GHZ(1),
-       SR_HZ(1),
-       NULL,
+       .low  = SR_HZ(1),
+       .high = SR_GHZ(1),
+       .step = SR_HZ(1),
+       .list = NULL,
 };
 
 static const char *pattern_strings[] = {
@@ -187,11 +187,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-       struct drv_context *drvc;
-
-       drvc = di->priv;
-
-       return drvc->instances;
+       return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)