Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp3543169ybb; Tue, 31 Mar 2020 07:21:30 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvVij9IEQwkAQ43bgbgY3zoVYqUE6u40SVIlQqcvaQsLqyUGxysxrD1ucjaDS0NiU+5yULh X-Received: by 2002:a4a:c819:: with SMTP id s25mr3210715ooq.6.1585664490193; Tue, 31 Mar 2020 07:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585664490; cv=none; d=google.com; s=arc-20160816; b=j/kQaO0/xzo6MXQUQlMusdu8uWW2sktFPqE66BcVEcWdfJmDIhPzNaU0PynIt0Mxw4 uVZPWP67W9UImckLblWoINn5WauiN+pyNSVI3mx3hp2yODUCvd05NccmrmXiDxMmVwob VgFwXj9snxBPMWZ1ZFNsGagDNBquPIVOiYO9U7ZuHN+2Ml33iOG6oVZe2Zqs/7r1BNA/ G3SV7baz5fpxrPhJzGEUHvA/74I3Q0qOuLdkvzcJViXq0xkVo0fyu0UCDWoBNzHB59s+ n1ND4dnJo/YseX9TBWUfWi++tmMZO9i+8GR6dNC6BKlJ/GjR/mXi1niZo1Woxam1CWft C8Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=kGkpE1LHTT+J5A34bqi0i/+EaG5SFmGKZQyI8vARqzs=; b=kbOUYfy5pHX4DrY84mRCA4IRPhndjMu6Mtm5GRnT0CaurmEwrsa5NhEq54UVYNZGtt yh/+tzh8g9p9FcUSPOkbiGUfI03YJuh78zixxWiGXOocFJGuHWmv+sNUIW187Bp3Pc5i 4Q9xpkRQeqECfviVhKZrq3roqgNldEIpu1CZLfjoKnDIK+YCdB9syUlOPppkpGDpaTqn +5znQoSrro6hoM1glzUHbhG0TZHkCPXgsByCv7yVcK2lG9lzDRm+SHXQjd0uSU1Tjl1Q vQSGEInZ7npBW2DpDDOA3jXouNcU6csgacqBKoeVRszdopjkftvAnog4ivX8FAO+Y6pm QsaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k185si7236998oif.13.2020.03.31.07.21.15; Tue, 31 Mar 2020 07:21:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730896AbgCaOTN (ORCPT + 99 others); Tue, 31 Mar 2020 10:19:13 -0400 Received: from foss.arm.com ([217.140.110.172]:53866 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730464AbgCaOTM (ORCPT ); Tue, 31 Mar 2020 10:19:12 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0D33E7FA; Tue, 31 Mar 2020 07:19:12 -0700 (PDT) Received: from [10.57.60.204] (unknown [10.57.60.204]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E3A673F71E; Tue, 31 Mar 2020 07:19:10 -0700 (PDT) Subject: Re: [PATCH] iommu/arm-smmu-v3: move error checking into common path To: luanshi , Will Deacon , Joerg Roedel Cc: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org References: <1585663188-114303-1-git-send-email-zhangliguang@linux.alibaba.com> From: Robin Murphy Message-ID: <749b7fb7-06c2-bde3-55e9-03232287d727@arm.com> Date: Tue, 31 Mar 2020 15:19:08 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <1585663188-114303-1-git-send-email-zhangliguang@linux.alibaba.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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-03-31 2:59 pm, luanshi wrote: > Move error checking into common path to be consistent with > drivers/iommu/arm-smmu.c. > > Signed-off-by: Liguang Zhang > --- > drivers/iommu/arm-smmu-v3.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index aa3ac2a..970f1c9 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -3889,13 +3889,13 @@ static int arm_smmu_device_probe(struct platform_device *pdev) > } > smmu->dev = dev; > > - if (dev->of_node) { > + if (dev->of_node) > ret = arm_smmu_device_dt_probe(pdev, smmu); > - } else { > + else > ret = arm_smmu_device_acpi_probe(pdev, smmu); > - if (ret == -ENODEV) > - return ret; > - } > + > + if (ret) > + return ret; This completely changes the flow WRT the bypass decision below, so without a clear justification of why that's OK, NAK. Robin. > > /* Set bypass mode according to firmware probing result */ > bypass = !!ret; >