From: Pawel Baldysiak <pawel.baldysiak@intel.com>
Date: Fri, 11 Mar 2016 15:47:16 +0000 (+0100)
Subject: super-intel: Simplify for() loop in ahci_enumerate_ports
X-Git-Tag: mdadm-4.0~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a6dd6b9c12dab2035eb44f480da96533a6dcf94;p=thirdparty%2Fmdadm.git

super-intel: Simplify for() loop in ahci_enumerate_ports

This patch simplifies for() loop used in
ahci_enumerate_ports(). It makes it more readable.
Similar thing was done in b913501
({platform,super}-intel: Fix two resource leaks).

Signed-off-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---

diff --git a/super-intel.c b/super-intel.c
index 8a80c5b0..1bc3688d 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -1624,7 +1624,10 @@ static int ahci_enumerate_ports(const char *hba_path, int port_count, int host_b
 	 * this hba
 	 */
 	dir = opendir("/sys/dev/block");
-	for (ent = dir ? readdir(dir) : NULL; ent; ent = readdir(dir)) {
+	if (!dir)
+		return 1;
+
+	for (ent = readdir(dir); ent; ent = readdir(dir)) {
 		int fd;
 		char model[64];
 		char vendor[64];