From patchwork Thu Jan 11 08:22:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 10157475 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BA20D601A1 for ; Thu, 11 Jan 2018 08:24:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A914F286CA for ; Thu, 11 Jan 2018 08:24:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C7E028700; Thu, 11 Jan 2018 08:24:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A279286CA for ; Thu, 11 Jan 2018 08:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=CfkNsaptGOfVMX8Lc8RwT8rIjX96vjNZsF/c3Jes8CE=; b=AEWMwwvxeHk68afuWeUAfRvmJQ +hY2X/eBglWXBW5muC6IO0HsSkBMYEgqeNP5g6T5TpXtLkQoPulhSXQrcbM6LGLXaMOekvXhed9pg Jyao7DdNcAXkVqj5s2wZg9yunG+gDsrZNmKLzR9RaW3NgZpBQgJ0dAwHllbuG7ok0yhkBW2fQKLvl sERNPipuxGYTgNQHWas6wS8Livf5SmaWnS2EgH9h1En2DZpPdeYCbY9wkztoyooUhuzDpI+ttcl7E hQrv78Tlg+0sfgGegK7Ep3ucHByzWHKvwVCOkelOv4vD9lPayyojF+h+NOsOcb+Nh2pXOp7LFEG81 AAohV/qQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eZY9b-0000Bk-TT; Thu, 11 Jan 2018 08:24:03 +0000 Received: from regular1.263xmail.com ([211.150.99.133]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eZY9B-0007le-LQ; Thu, 11 Jan 2018 08:23:42 +0000 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.201]) by regular1.263xmail.com (Postfix) with ESMTP id 5E1988F1C; Thu, 11 Jan 2018 16:23:30 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id 94F3A384; Thu, 11 Jan 2018 16:23:26 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 18415LLUB2U; Thu, 11 Jan 2018 16:23:31 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org Subject: [PATCH 4/9] iommu/rockchip: Fix error handling in init Date: Thu, 11 Jan 2018 16:22:24 +0800 Message-Id: <20180111082229.24011-5-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180111082229.24011-1-jeffy.chen@rock-chips.com> References: <20180111082229.24011-1-jeffy.chen@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180111_002338_333670_B60A6637 X-CRM114-Status: UNSURE ( 8.07 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , Joerg Roedel , Jeffy Chen , tfiga@chromium.org, jcliang@chromium.org, linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP It's hard to undo bus_set_iommu() in the error path, so move it to the end of init call. Signed-off-by: Jeffy Chen --- drivers/iommu/rockchip-iommu.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index a05844cabb45..5f141390b4d7 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1247,17 +1247,25 @@ static int __init rk_iommu_init(void) of_node_put(np); - ret = bus_set_iommu(&platform_bus_type, &rk_iommu_ops); - if (ret) - return ret; - ret = platform_driver_register(&rk_iommu_domain_driver); if (ret) return ret; ret = platform_driver_register(&rk_iommu_driver); if (ret) - platform_driver_unregister(&rk_iommu_domain_driver); + goto err_unreg_domain_drv; + + ret = bus_set_iommu(&platform_bus_type, &rk_iommu_ops); + if (ret) + goto err_unreg_iommu_drv; + + return 0; + +err_unreg_iommu_drv: + platform_driver_unregister(&rk_iommu_driver); +err_unreg_domain_drv: + platform_driver_unregister(&rk_iommu_domain_driver); + return ret; } static void __exit rk_iommu_exit(void)