From patchwork Fri Jun 14 17:54:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 166903 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2353420ilk; Fri, 14 Jun 2019 10:55:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqz1OO3Jir2MNbFBVDxfooR2aVxsxqK5gmjQmGoWsm0qdEMg/bGQsS9SYjSgGuUM+nFd847r X-Received: by 2002:a17:902:2a6b:: with SMTP id i98mr9687250plb.75.1560534957613; Fri, 14 Jun 2019 10:55:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560534957; cv=none; d=google.com; s=arc-20160816; b=riwaQxJS3EIZSzuEPC7zhX1ZbcM3UTu5kM/jsqFwGFnFYLwPWGc6W1vF5Xgf4vfd65 HZ20elNSoq9zgZzsJHc/a2zSnz7iIibWg9K2cef+qwfS+v6c1XvTDMcM8xbug4BzkQcY 2RHMStGouFNg6BR6fnu6MmqRAUbtAjqE/+HQvWDwqnci4jIHgSPhHwgs7TogMIPzzdWX VIa1C4svWr/CznFbVDGBGX6GUTYgr3FeeXMjOP98YZz4ccUiorWSyMxJHYSDIZAug48v ctoCgwXxvCPDP1yAa0CnctD6HBnK+SQppTEUQUsKPSO+d1KBsBzx2XnB9FdM3G7du9Y+ 2b7A== 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; bh=vSetV/954vHFstIkRtuzO6E0HcW4CdkezyXXO8JEOqM=; b=jjhJ/cuaXu4aLMBfaZcoMTvwTqTz7bT/SWULCB+UGOKiO8VLH0J/RPAfTVI5eKSGQA rbZQ2Kf+z/HKYO47cDqLfYsEycWDUl6v41q7LFw8RatK/pmAPPb1VVU3QnLWBKEN7HFP cRcY7qw6dP6K+X6yqiPzZJMVdV5bzJJXxfgmOOJISIOAqon4hj3luzu8eiE38uqC/78j zhWx1Fe0mLCPLmXqUzH4l3TqtFf3ud82Mq3VoeriTSR9tZYGtlEeEU8Z0JPPJNjkKoiq s4n8pPsa465MOwsgbQHlz/ZsD8glupDas6k7OCdq49NPc1S3Qo39m1FPtM6QxSEE/YiQ ZiGQ== 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 t24si3143658pgm.502.2019.06.14.10.55.57; Fri, 14 Jun 2019 10:55:57 -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 S1727805AbfFNRzu (ORCPT + 17 others); Fri, 14 Jun 2019 13:55:50 -0400 Received: from foss.arm.com ([217.140.110.172]:39682 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727675AbfFNRz0 (ORCPT ); Fri, 14 Jun 2019 13:55:26 -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 318493EF; Fri, 14 Jun 2019 10:55:26 -0700 (PDT) Received: from en101.cambridge.arm.com (en101.cambridge.arm.com [10.1.196.93]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 49C813F718; Fri, 14 Jun 2019 10:55:25 -0700 (PDT) From: Suzuki K Poulose To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, rafael@kernel.org, suzuki.poulose@arm.com, Lee Jones , Thor Thayer Subject: [PATCH v2 23/28] drivers: Introduce driver_find_device_by_of_node() helper Date: Fri, 14 Jun 2019 18:54:18 +0100 Message-Id: <1560534863-15115-24-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560534863-15115-1-git-send-email-suzuki.poulose@arm.com> References: <1560534863-15115-1-git-send-email-suzuki.poulose@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a wrapper to driver_find_device() to search for a device by the of_node pointer, reusing the generic match function. Also convert the existing users to make use of the new helper. Cc: Lee Jones Cc: Thor Thayer Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Acked-by: Thor Thayer Signed-off-by: Suzuki K Poulose --- drivers/amba/tegra-ahb.c | 11 +---------- drivers/mfd/altera-sysmgr.c | 14 ++------------ include/linux/device.h | 13 +++++++++++++ 3 files changed, 16 insertions(+), 22 deletions(-) -- 2.7.4 diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index aa64eec..57d3b2e 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -134,22 +134,13 @@ static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset) } #ifdef CONFIG_TEGRA_IOMMU_SMMU -static int tegra_ahb_match_by_smmu(struct device *dev, const void *data) -{ - struct tegra_ahb *ahb = dev_get_drvdata(dev); - const struct device_node *dn = data; - - return (ahb->dev->of_node == dn) ? 1 : 0; -} - int tegra_ahb_enable_smmu(struct device_node *dn) { struct device *dev; u32 val; struct tegra_ahb *ahb; - dev = driver_find_device(&tegra_ahb_driver.driver, NULL, dn, - tegra_ahb_match_by_smmu); + dev = driver_find_device_by_of_node(&tegra_ahb_driver.driver, dn); if (!dev) return -EPROBE_DEFER; ahb = dev_get_drvdata(dev); diff --git a/drivers/mfd/altera-sysmgr.c b/drivers/mfd/altera-sysmgr.c index 2ee14d8..d2a13a5 100644 --- a/drivers/mfd/altera-sysmgr.c +++ b/drivers/mfd/altera-sysmgr.c @@ -88,16 +88,6 @@ static struct regmap_config altr_sysmgr_regmap_cfg = { }; /** - * sysmgr_match_phandle - * Matching function used by driver_find_device(). - * Return: True if match is found, otherwise false. - */ -static int sysmgr_match_phandle(struct device *dev, const void *data) -{ - return dev->of_node == (const struct device_node *)data; -} - -/** * altr_sysmgr_regmap_lookup_by_phandle * Find the sysmgr previous configured in probe() and return regmap property. * Return: regmap if found or error if not found. @@ -117,8 +107,8 @@ struct regmap *altr_sysmgr_regmap_lookup_by_phandle(struct device_node *np, if (!sysmgr_np) return ERR_PTR(-ENODEV); - dev = driver_find_device(&altr_sysmgr_driver.driver, NULL, - (void *)sysmgr_np, sysmgr_match_phandle); + dev = driver_find_device_by_of_node(&altr_sysmgr_driver.driver, + (void *)sysmgr_np); of_node_put(sysmgr_np); if (!dev) return ERR_PTR(-EPROBE_DEFER); diff --git a/include/linux/device.h b/include/linux/device.h index 0d3958e..f929671 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -437,6 +437,19 @@ static inline struct device *driver_find_device_by_name(struct device_driver *dr return driver_find_device(drv, NULL, name, device_match_name); } +/** + * driver_find_device_by_of_node- device iterator for locating a particular device + * by of_node pointer. + * @driver: the driver we're iterating + * @np: of_node pointer to match. + */ +static inline struct device * +driver_find_device_by_of_node(struct device_driver *drv, + const struct device_node *np) +{ + return driver_find_device(drv, NULL, np, device_match_of_node); +} + void driver_deferred_probe_add(struct device *dev); int driver_deferred_probe_check_state(struct device *dev);