From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755706AbeARMrh (ORCPT ); Thu, 18 Jan 2018 07:47:37 -0500 Received: from foss.arm.com ([217.140.101.70]:54756 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750841AbeARMrg (ORCPT ); Thu, 18 Jan 2018 07:47:36 -0500 Subject: Re: [PATCH v4 11/13] iommu/rockchip: Fix error handling in init To: Jeffy Chen , linux-kernel@vger.kernel.org Cc: jcliang@chromium.org, xxm@rock-chips.com, tfiga@chromium.org, Heiko Stuebner , linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel , linux-arm-kernel@lists.infradead.org References: <20180118115251.5542-1-jeffy.chen@rock-chips.com> <20180118115251.5542-12-jeffy.chen@rock-chips.com> From: Robin Murphy Message-ID: Date: Thu, 18 Jan 2018 12:47:33 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180118115251.5542-12-jeffy.chen@rock-chips.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 18/01/18 11:52, Jeffy Chen wrote: > It's hard to undo bus_set_iommu() in the error path, so move it to the > end of rk_iommu_probe(). Reviewed-by: Robin Murphy > Signed-off-by: Jeffy Chen > Reviewed-by: Tomasz Figa > --- > > Changes in v4: None > Changes in v3: None > Changes in v2: > Move bus_set_iommu() to rk_iommu_probe(). > > drivers/iommu/rockchip-iommu.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c > index b1f177ae03c7..2c095f96c033 100644 > --- a/drivers/iommu/rockchip-iommu.c > +++ b/drivers/iommu/rockchip-iommu.c > @@ -1195,6 +1195,8 @@ static int rk_iommu_probe(struct platform_device *pdev) > if (!dma_dev) > dma_dev = &pdev->dev; > > + bus_set_iommu(&platform_bus_type, &rk_iommu_ops); > + > return 0; > err_remove_sysfs: > iommu_device_sysfs_remove(&iommu->iommu); > @@ -1220,19 +1222,6 @@ static struct platform_driver rk_iommu_driver = { > > static int __init rk_iommu_init(void) > { > - struct device_node *np; > - int ret; > - > - np = of_find_matching_node(NULL, rk_iommu_dt_ids); > - if (!np) > - return 0; > - > - of_node_put(np); > - > - ret = bus_set_iommu(&platform_bus_type, &rk_iommu_ops); > - if (ret) > - return ret; > - > return platform_driver_register(&rk_iommu_driver); > } > subsys_initcall(rk_iommu_init); >