From: Laine Stump <laine@redhat.com>
Date: Sat, 10 Oct 2020 21:50:11 +0000 (-0400)
Subject: util: simplify virPCIDriverDir() and its callers
X-Git-Tag: v6.9.0-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3066b55bfa7a123c685dce9a688b0c2336b6c16;p=thirdparty%2Flibvirt.git

util: simplify virPCIDriverDir() and its callers

There is no need for a temporary variable in this function, and since
it can't return NULL, no need for callers to check for it.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 0786ddd478..ac37a60576 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -209,10 +209,7 @@ VIR_ONCE_GLOBAL_INIT(virPCI);
 static char *
 virPCIDriverDir(const char *driver)
 {
-    char *buffer;
-
-    buffer = g_strdup_printf(PCI_SYSFS "drivers/%s", driver);
-    return buffer;
+    return g_strdup_printf(PCI_SYSFS "drivers/%s", driver);
 }
 
 
@@ -1002,7 +999,9 @@ virPCIProbeStubDriver(virPCIStubDriver driver)
     }
 
  recheck:
-    if ((drvpath = virPCIDriverDir(drvname)) && virFileExists(drvpath))
+    drvpath = virPCIDriverDir(drvname);
+
+    if (virFileExists(drvpath))
         /* driver already loaded, return */
         return 0;
 
@@ -1153,9 +1152,7 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev)
         return -1;
     }
 
-    if (!(stubDriverPath = virPCIDriverDir(stubDriverName)))
-        return -1;
-
+    stubDriverPath = virPCIDriverDir(stubDriverName);
     driverLink = virPCIFile(dev->name, "driver");
 
     if (virFileExists(driverLink)) {