[PATCH 6/7] node_device: udevTranslatePCIIds() to void

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



udevTranslatePCIIds() return value
is invariant, so change it type and remove all dependent
checks.

Fixes: 7f1f0453fc ("node_device: use g_strdup instead of VIR_STRDUP")

Signed-off-by: Artem Chernyshev <artem.chernyshev@xxxxxxxxxxx>
---
 src/node_device/node_device_udev.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 911325600e..8d38aec070 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -332,7 +332,7 @@ udevGenerateDeviceName(struct udev_device *device,
 
 static virMutex pciaccessMutex = VIR_MUTEX_INITIALIZER;
 
-static int
+static void
 udevTranslatePCIIds(unsigned int vendor,
                     unsigned int product,
                     char **vendor_string,
@@ -356,8 +356,6 @@ udevTranslatePCIIds(unsigned int vendor,
 
     *vendor_string = g_strdup(vendor_name);
     *product_string = g_strdup(device_name);
-
-    return 0;
 }
 
 
@@ -398,12 +396,10 @@ udevProcessPCI(struct udev_device *device,
     if (udevGetUintSysfsAttr(device, "device", &pci_dev->product, 16) < 0)
         goto cleanup;
 
-    if (udevTranslatePCIIds(pci_dev->vendor,
-                            pci_dev->product,
-                            &pci_dev->vendor_name,
-                            &pci_dev->product_name) != 0) {
-        goto cleanup;
-    }
+    udevTranslatePCIIds(pci_dev->vendor,
+                        pci_dev->product,
+                        &pci_dev->vendor_name,
+                        &pci_dev->product_name);
 
     udevGenerateDeviceName(device, def, NULL);
 
-- 
2.43.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux