From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4BD4C2BB85 for ; Sun, 12 Apr 2020 23:02:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 713A820708 for ; Sun, 12 Apr 2020 23:02:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OB+27OH3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 713A820708 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNlcw-0007hm-Jk for qemu-devel@archiver.kernel.org; Sun, 12 Apr 2020 19:02:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49982) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNlJP-0001mW-Nk for qemu-devel@nongnu.org; Sun, 12 Apr 2020 18:42:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNlJO-0006Cn-Ln for qemu-devel@nongnu.org; Sun, 12 Apr 2020 18:42:47 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42345) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNlJO-0006C0-8l; Sun, 12 Apr 2020 18:42:46 -0400 Received: by mail-wr1-x441.google.com with SMTP id j2so8531138wrs.9; Sun, 12 Apr 2020 15:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tmj0eQ/jXEgx8kgOc8dKTvgUtekWQN1v/ToBNcJYlPA=; b=OB+27OH38nTPemyz5GLpHLn+gLiy1+2phP1VkwRHRb9clpZasalIFwXgdCZOiG0T1S kXDxK6p7cs6uKkmwWbFOZ2JVfZS0c+DAdojdrDHkU+IyGLMwlbhRK4D+un6iFEqe+UL1 Uw1oxQvhYTBMtYkub0PXN8BOYbT3KmUqOEJCl75A3lfl1wgU3rkCLmeY40D02nlC1rM5 nroWb2zoX44Zf/9KZZg+ndGUb2zkr0ZniUbtY7LAFB+DveoI/HXephWZN/Huw3sqDUMJ UPNJRgYquq4hoSNevkYSB19Akbxkj/qWFb0MAbDHU3LGtzdFguVgqcgD7QY7EB4VgqRD GwJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tmj0eQ/jXEgx8kgOc8dKTvgUtekWQN1v/ToBNcJYlPA=; b=Jq+/vyxzJaNnMARJnsTzPywNAyxnfrXMrGNlkL3Mm1Q7kkuJIhKhwvdOGagDoVxKzx DkfTh81gAkW77Yz4c0kcCcXQmbXR/rGxFxpr9SIe2mf0+ePos86n1fYPifTz7VNjX3XF 8V1nDK6CQmZwzCCxDH+XR4cc/I8ge38UeB4ri8ZLUqfAxxVTY5+8XGt68hSUDtla5UUV F43Xv+x4y51cadFUNINAfW6DwniehbDj6tuUIqKtidHWu/mDyg+iQxOGc2TjCby8WAQ/ 9Gw3u4x/61Fh2xQU3X5qCT3QcP+5fBDJR707XoF03EDbvGTBhptJgcU1RuQpcxRInLAb ES5g== X-Gm-Message-State: AGi0PuZQSKe4V1s5nJRqzd3HAx/H3Ia/Z/Re/tGuPobrx2BN+RYStsrP BkgICM7suxfRU97GbrsvdYo5J31mWxOL0g== X-Google-Smtp-Source: APiQypLbgIM799geoIA/qmOY2jB+pRTLyHqEoJQfrLFQByCZGICQUV3OHdnSoDGHCBXm9lNMXkBquA== X-Received: by 2002:adf:b1c8:: with SMTP id r8mr15633926wra.218.1586731364735; Sun, 12 Apr 2020 15:42:44 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id f63sm12083825wma.47.2020.04.12.15.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Apr 2020 15:42:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 v3 15/23] hw/arm/fsl-imx: Add missing error-propagation code Date: Mon, 13 Apr 2020 00:41:36 +0200 Message-Id: <20200412224144.12205-16-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200412224144.12205-1-f4bug@amsat.org> References: <20200412224144.12205-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Sagar Karandikar , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , Alistair Francis , "Edgar E. Iglesias" , Subbaraya Sundeep , qemu-block@nongnu.org, Markus Armbruster , Aleksandar Markovic , Max Reitz , Joel Stanley , Palmer Dabbelt , Aleksandar Rikalo , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , Kevin Wolf , qemu-riscv@nongnu.org, Andrew Jeffery , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , Jean-Christophe Dubois , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Patch created mechanically by running: $ spatch \ --macro-file scripts/cocci-macro-file.h --include-headers \ --sp-file scripts/coccinelle/add-missing-error_propagate.cocci \ --keep-comments --smpl-spacing --in-place --dir hw Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/fsl-imx25.c | 8 ++++++++ hw/arm/fsl-imx6.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c index 3d87fe867e..69d8645dcd 100644 --- a/hw/arm/fsl-imx25.c +++ b/hw/arm/fsl-imx25.c @@ -271,8 +271,16 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp) object_property_set_uint(OBJECT(&s->esdhc[i]), 2, "sd-spec-version", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_uint(OBJECT(&s->esdhc[i]), IMX25_ESDHC_CAPABILITIES, "capareg", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->esdhc[i]), true, "realized", &err); if (err) { error_propagate(errp, err); diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index b3cef5bb57..c254294a70 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -343,8 +343,16 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) /* UHS-I SDIO3.0 SDR104 1.8V ADMA */ object_property_set_uint(OBJECT(&s->esdhc[i]), 3, "sd-spec-version", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_uint(OBJECT(&s->esdhc[i]), IMX6_ESDHC_CAPABILITIES, "capareg", &err); + if (err) { + error_propagate(errp, err); + return; + } object_property_set_bool(OBJECT(&s->esdhc[i]), true, "realized", &err); if (err) { error_propagate(errp, err); -- 2.21.1