From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xw7AJ-0002u9-Jq for qemu-devel@nongnu.org; Wed, 03 Dec 2014 05:28:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xw7AD-0003yg-Fn for qemu-devel@nongnu.org; Wed, 03 Dec 2014 05:28:11 -0500 From: Markus Armbruster Date: Wed, 3 Dec 2014 11:28:02 +0100 Message-Id: <1417602482-8832-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] Drop superfluous conditionals around qemu_opts_del() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com Signed-off-by: Markus Armbruster --- hw/core/qdev.c | 4 +--- qemu-char.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 35fd00d..901f289 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -1141,9 +1141,7 @@ static void device_finalize(Object *obj) NamedGPIOList *ngl, *next; DeviceState *dev = DEVICE(obj); - if (dev->opts) { - qemu_opts_del(dev->opts); - } + qemu_opts_del(dev->opts); QLIST_FOREACH_SAFE(ngl, &dev->gpios, node, next) { QLIST_REMOVE(ngl, node); diff --git a/qemu-char.c b/qemu-char.c index a8b01da..ef84b53 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3825,9 +3825,7 @@ void qemu_chr_delete(CharDriverState *chr) } g_free(chr->filename); g_free(chr->label); - if (chr->opts) { - qemu_opts_del(chr->opts); - } + qemu_opts_del(chr->opts); g_free(chr); } -- 1.9.3