From patchwork Thu Jun 28 20:43:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 140480 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp29302ljj; Thu, 28 Jun 2018 13:44:45 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKfJVBhwaZ67x53QVWwDi5CPG8Gq4FZvw3qODeG85AyNu5EOPPvQ0l5gPH/H7u4UG1FkfWw X-Received: by 2002:a17:902:8:: with SMTP id 8-v6mr12186855pla.287.1530218685047; Thu, 28 Jun 2018 13:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530218685; cv=none; d=google.com; s=arc-20160816; b=Lw3s5naA6oSJxu62rCv5Ytt1lnUBw1yK1yg4sY9w0rp49CzDxF7mCth/ZU246bC+3J joNUmfR5+9CDauNoFCjblOSgHs43Y3x5mprJCRE37D5DubCqQ7VZcGFlKdeBcg23LpyK qoeAQ1UKs0vAJL1XzNxo04g/B9zZHobM3fExScrpI5PR/xUH2BZRMcd+p2LUutqHZiA8 yW7RuEEz3XViH5aIz/7yl/+II3tXp5ZLl5A3X/tFTl9GOjunqLeAHBV7RbPNNRJXxR7H bftEWXVnjjnxwZYpiPYJv1qLqsgoLVXs3f21WCVFDqRoHWIkyqQw5YRVF3Yau0W7+eVq 8F0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=BYYywmjJp5embejeIhk/VCtDXRH+EcxILfGn2mhUR6c=; b=QRuB2ARCPhc4xWtNVTJ9IfeOrpQq3ZLclX+4xZiDbFi14lpjZcnvKaPRSonGQG2vNf 40osULNH1DnZdofIH6ROwpEUvDwFU/t/Dxnt14KERnJiu2/FzH0fr55uBkOqWQwMA70B eUTZfYqyF43KU0R1OvOiiBfhal2sJxpYFBcqnGCNUBFmXjfFzwNOCEFds2XB7x6IwvKU rcYD1Le78s7BVmdB8CDJoY8/HXE+eOnw3kpMRtI9GDkhbGM5z/S3pL22KXFPuCLSN4BX CtO0FJmOSW6rxsYXj4FUtQ2Yaab1QGAYFBYG+xddrDpwIZLpcGUw/uVAnKwv7O/woUFd /ZWQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o32-v6si7347498pld.440.2018.06.28.13.44.44; Thu, 28 Jun 2018 13:44:45 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936079AbeF1Uol (ORCPT + 31 others); Thu, 28 Jun 2018 16:44:41 -0400 Received: from mail-yb0-f195.google.com ([209.85.213.195]:38001 "EHLO mail-yb0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754882AbeF1Un5 (ORCPT ); Thu, 28 Jun 2018 16:43:57 -0400 Received: by mail-yb0-f195.google.com with SMTP id f12-v6so2534100ybp.5; Thu, 28 Jun 2018 13:43:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BYYywmjJp5embejeIhk/VCtDXRH+EcxILfGn2mhUR6c=; b=E7mrKQng8nfrPI6QYbHVaMEIHHiB6fieiNXdyXzTVHxzO2ml+MOGsnMoMfchDhrNC/ PA9U4eW6xwk+knjmhbhX4esOIVOHyC19YK8Is/vvgWvTrSQI+ApPRTJovq0JMBNelosG E91MJFhYywsxICMjWW/x5qF4J+9AiyWCy3Z5V5yWKDtFu9f/xRvx6umtDvT93WQhNMuq o3Dt3hk42TszWIL2rrsqNVvrGt/AZLtfVnJCPyWfWzJs2DpZwQ5GW5SPbrm0x5iJbh4W kCigvTmG913CZro8tvGKn7eGUhWmzzKRXddX2cjlRufac7GVs9jQ0+6o3mk1O4vRrb7v V85w== X-Gm-Message-State: APt69E3zrbnZzT0rk8dCHzi8Nk5wwUuep82aq0I8F5XRZ1Q2OLUx5NWB bHuFsS50Wl6kWHV+s0w/jA== X-Received: by 2002:a25:2d43:: with SMTP id s3-v6mr5985146ybe.108.1530218636717; Thu, 28 Jun 2018 13:43:56 -0700 (PDT) Received: from localhost.localdomain (24-223-123-72.static.usa-companies.net. [24.223.123.72]) by smtp.googlemail.com with ESMTPSA id o7-v6sm427913ywi.32.2018.06.28.13.43.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:43:56 -0700 (PDT) From: Rob Herring To: Greg Kroah-Hartman , Linus Walleij , Alexander Graf , Bjorn Andersson , "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , Joerg Roedel , Robin Murphy , Mark Brown , Frank Rowand Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, boot-architecture@lists.linaro.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel Subject: [PATCH v3 4/6] iommu: Stop deferring probe at end of initcalls Date: Thu, 28 Jun 2018 14:43:42 -0600 Message-Id: <20180628204344.13973-5-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180628204344.13973-1-robh@kernel.org> References: <20180628204344.13973-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The IOMMU subsystem has its own mechanism to not defer probe if driver support is missing. Now that the driver core supports stopping deferring probe if drivers aren't built-in (and probed), use the driver core support so the IOMMU specific support can be removed. Acked-by: Joerg Roedel Cc: iommu@lists.linux-foundation.org Signed-off-by: Rob Herring --- v3: - Update to new function name drivers/iommu/of_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 5c36a8b7656a..78ddf47dd67a 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -133,7 +133,7 @@ static int of_iommu_xlate(struct device *dev, * a proper probe-ordering dependency mechanism in future. */ if (!ops) - return -EPROBE_DEFER; + return driver_deferred_probe_check_state(dev); return ops->of_xlate(dev, iommu_spec); }