From: Antonio Ospite <ao2@ao2.it>
Date: Tue, 14 Feb 2017 09:04:19 +0000 (+0100)
Subject: am7xxx: simplify the device info caching operation in am7xxx_open_device()
X-Git-Tag: v0.1.7~32
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/80417f30dc0d1ff825d887032507511be4dcc11b?ds=inline;hp=3e874361f193d7ce9dec3971fd1d4923fea1a9a5

am7xxx: simplify the device info caching operation in am7xxx_open_device()

Now that am7xxx_get_device_info() is more robust, the check in the
caller can be avoided.
---

diff --git a/src/am7xxx.c b/src/am7xxx.c
index 512cf6f..84d7e9c 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -1179,14 +1179,14 @@ AM7XXX_PUBLIC int am7xxx_open_device(am7xxx_context *ctx, am7xxx_device **dev,
 	 * is the first one to be sent to the device in order for it to
 	 * successfully return the correct device information.
 	 *
-	 * So, if there is not a cached version of it (from a previous open),
-	 * we ask for device info at open time,
+	 * NOTE: am7xxx_get_device_info() will fetch the actual device info
+	 * from the device only the very first time it's called for a given
+	 * device, otherwise, it'll return a cached version of the device info
+	 * (from a previous call to am7xxx_open_device(), for instance).
 	 */
-	if ((*dev)->device_info == NULL) {
-		ret = am7xxx_get_device_info(*dev, NULL);
-		if (ret < 0)
-			error(ctx, "cannot get device info\n");
-	}
+	ret = am7xxx_get_device_info(*dev, NULL);
+	if (ret < 0)
+		error(ctx, "cannot get device info\n");
 
 out:
 	return ret;