From 5231b480d461ab94b6a1971f2361fe58f8596096 Mon Sep 17 00:00:00 2001 From: Daniel Henrique Barboza Date: Mon, 21 Oct 2019 15:18:56 -0300 Subject: [PATCH] node_device: remove unneeded cleanup labels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Henrique Barboza Reviewed-by: Ján Tomko --- src/node_device/node_device_driver.c | 11 +++-------- src/node_device/node_device_udev.c | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 148ae15fed..ebcc9696af 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -587,20 +587,15 @@ int nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, int callbackID) { - int ret = -1; - if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0) - goto cleanup; + return -1; if (virObjectEventStateDeregisterID(conn, driver->nodeDeviceEventState, callbackID, true) < 0) - goto cleanup; + return -1; - ret = 0; - - cleanup: - return ret; + return 0; } int diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 29cd0ea573..fabd2ec454 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1259,7 +1259,6 @@ udevSetParent(struct udev_device *device, const char *parent_sysfs_path = NULL; virNodeDeviceObjPtr obj = NULL; virNodeDeviceDefPtr objdef; - int ret = -1; parent_device = device; do { @@ -1273,7 +1272,7 @@ udevSetParent(struct udev_device *device, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get syspath for parent of '%s'"), udev_device_get_syspath(parent_device)); - goto cleanup; + return -1; } if ((obj = virNodeDeviceObjListFindBySysfsPath(driver->devs, @@ -1290,10 +1289,7 @@ udevSetParent(struct udev_device *device, if (!def->parent) def->parent = g_strdup("computer"); - ret = 0; - - cleanup: - return ret; + return 0; }