From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C825C43382 for ; Tue, 25 Sep 2018 07:42:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B476D214C1 for ; Tue, 25 Sep 2018 07:42:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=mvista-com.20150623.gappssmtp.com header.i=@mvista-com.20150623.gappssmtp.com header.b="GXfpphrl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B476D214C1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mvista.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728795AbeIYNsa (ORCPT ); Tue, 25 Sep 2018 09:48:30 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:36965 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728382AbeIYNsa (ORCPT ); Tue, 25 Sep 2018 09:48:30 -0400 Received: by mail-pf1-f194.google.com with SMTP id x26-v6so582374pfn.4 for ; Tue, 25 Sep 2018 00:42:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+OGTAZbek8VfxbTvzVO0pcLCm8f83K5JNPnihjOjx7o=; b=GXfpphrl1hqduxlcnRZpATxqHmB0zfWQFmVwIgmw4jtNg8lMYcV10DJ8eLcNhAGIRj /v7eCj9w74s32//Va4ki0/plJ2oKI3xcU4hSe9q2y8/A8o0XYEaMk8wGMmK/UnskrUS9 XJKt19RTW4chVm9Ue0B/bNqOelEGBlyaf8L/cb0AorUgxAN2XkOBiYqTBK3RpQSobzlP JnWJKnTJx5yxNOqIrCgWbnUUQwMLDcZurAcZxE2urYmWfkg+Ryg/FEEYHwYNAKw7OKIk Mef0BKJca3u5RLiWUE6GvQ5KPMRoJLcwXFvMT8ebHIKVnrka+VJQNLq7qmni4B3g+b75 EbCA== 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=+OGTAZbek8VfxbTvzVO0pcLCm8f83K5JNPnihjOjx7o=; b=ljECOtg4jVK+hb04wLBIKCSZoqUBRK/ukVK1jTztcranJZ5cIOa/Qwe8ibCdIyoIZF iC6+elymd3sGDkuZBrk1V2VKBFGRnEzKKPzsUVdGYbLi9ByQE5O/sMOnfmKrUXpknzx7 u+p/fVdeNG6jZ9KVbrdTIoXJBiFfjztuV/rrGnRJIam81qCDxJ7nUBJOMBi0t4rOxNde wTiatFoLlzfZPNJtiGXqh8Y5YLQF21qQ3kdREFmHyfoErMXMI1a5aEwbEcFfi79dFuBP n3PoXQRRbm/+vfizn4ZQYw5yz6auTUFF3ybztETND49jZ2iOQaaF++thmjHd87UUD37t e0QQ== X-Gm-Message-State: ABuFfohL+IWFFKcyzEcTfEkxsnn+5qjQkESVRGaRB6/qgRhn9kiyap9h WxOQU0CuFdO0GK1QjWsOb3N+dg== X-Google-Smtp-Source: ACcGV62M0JiYNPTBz8n7W0a1JkSb0+4YgO8Vq6h2Gl0yarPHBHj2hSpOIVLIIx1jyaKm/B9I1DUBPQ== X-Received: by 2002:a62:3ac8:: with SMTP id v69-v6mr2292469pfj.164.1537861334298; Tue, 25 Sep 2018 00:42:14 -0700 (PDT) Received: from mercury.CELSYSJYN.IN ([182.72.92.62]) by smtp.gmail.com with ESMTPSA id u184-v6sm2337722pgd.27.2018.09.25.00.42.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Sep 2018 00:42:12 -0700 (PDT) From: Silesh C V To: Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: linux-kernel@vger.kernel.org, Rob Herring , Frank Rowand , Silesh C V Subject: [PATCH v2 2/2] treewide: use bus_find_device_by_fwnode Date: Tue, 25 Sep 2018 13:11:28 +0530 Message-Id: <1537861288-3293-1-git-send-email-svellattu@mvista.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use bus_find_device_by_fwnode helper to find the device having a specific firmware node on a bus. Signed-off-by: Silesh C V --- drivers/hwtracing/coresight/of_coresight.c | 14 ++++---------- drivers/i2c/i2c-core-of.c | 9 ++------- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 8 +------- drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 8 +------- drivers/nvmem/core.c | 7 +------ drivers/of/of_mdio.c | 8 +------- drivers/of/platform.c | 7 +------ drivers/spi/spi.c | 10 +++------- 8 files changed, 14 insertions(+), 57 deletions(-) diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c index 6880bee..8193b50 100644 --- a/drivers/hwtracing/coresight/of_coresight.c +++ b/drivers/hwtracing/coresight/of_coresight.c @@ -17,12 +17,6 @@ #include #include - -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - static struct device * of_coresight_get_endpoint_device(struct device_node *endpoint) { @@ -32,8 +26,8 @@ static int of_dev_node_match(struct device *dev, void *data) * If we have a non-configurable replicator, it will be found on the * platform bus. */ - dev = bus_find_device(&platform_bus_type, NULL, - endpoint, of_dev_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, + &endpoint->fwnode); if (dev) return dev; @@ -41,8 +35,8 @@ static int of_dev_node_match(struct device *dev, void *data) * We have a configurable component - circle through the AMBA bus * looking for the device that matches the endpoint node. */ - return bus_find_device(&amba_bustype, NULL, - endpoint, of_dev_node_match); + return bus_find_device_by_fwnode(&amba_bustype, NULL, + &endpoint->fwnode); } static void of_coresight_get_ports(const struct device_node *node, diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index 6cb7ad6..2b8ef8d 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -116,18 +116,13 @@ void of_i2c_register_devices(struct i2c_adapter *adap) of_node_put(bus); } -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /* must call put_device() when done with returned i2c_client device */ struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) { struct device *dev; struct i2c_client *client; - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); + dev = bus_find_device_by_fwnode(&i2c_bus_type, NULL, &node->fwnode); if (!dev) return NULL; @@ -145,7 +140,7 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) struct device *dev; struct i2c_adapter *adapter; - dev = bus_find_device(&i2c_bus_type, NULL, node, of_dev_node_match); + dev = bus_find_device_by_fwnode(&i2c_bus_type, NULL, &node->fwnode); if (!dev) return NULL; diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c index 081aa91..b0d418e 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c @@ -4832,19 +4832,13 @@ static void hns_roce_v1_cleanup_eq_table(struct hns_roce_dev *hr_dev) }; MODULE_DEVICE_TABLE(acpi, hns_roce_acpi_match); -static int hns_roce_node_match(struct device *dev, void *fwnode) -{ - return dev->fwnode == fwnode; -} - static struct platform_device *hns_roce_find_pdev(struct fwnode_handle *fwnode) { struct device *dev; /* get the 'device' corresponding to the matching 'fwnode' */ - dev = bus_find_device(&platform_bus_type, NULL, - fwnode, hns_roce_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, fwnode); /* get the platform device */ return dev ? to_platform_device(dev) : NULL; } diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c index 16294cd..d5d7c88 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c @@ -758,17 +758,11 @@ struct dsaf_misc_op *hns_misc_op_get(struct dsaf_device *dsaf_dev) return (void *)misc_op; } -static int hns_dsaf_dev_match(struct device *dev, void *fwnode) -{ - return dev->fwnode == fwnode; -} - struct platform_device *hns_dsaf_find_platform_device(struct fwnode_handle *fwnode) { struct device *dev; - dev = bus_find_device(&platform_bus_type, NULL, - fwnode, hns_dsaf_dev_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, fwnode); return dev ? to_platform_device(dev) : NULL; } diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index aa16578..b62f236 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -262,11 +262,6 @@ static void nvmem_release(struct device *dev) .name = "nvmem", }; -static int of_nvmem_match(struct device *dev, void *nvmem_np) -{ - return dev->of_node == nvmem_np; -} - static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) { struct device *d; @@ -274,7 +269,7 @@ static struct nvmem_device *of_nvmem_find(struct device_node *nvmem_np) if (!nvmem_np) return NULL; - d = bus_find_device(&nvmem_bus_type, NULL, nvmem_np, of_nvmem_match); + d = bus_find_device_by_fwnode(&nvmem_bus_type, NULL, &nvmem_np->fwnode); if (!d) return NULL; diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index e92391d..2906a6b 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -282,12 +282,6 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) } EXPORT_SYMBOL(of_mdiobus_register); -/* Helper function for of_phy_find_device */ -static int of_phy_match(struct device *dev, void *phy_np) -{ - return dev->of_node == phy_np; -} - /** * of_phy_find_device - Give a PHY node, find the phy_device * @phy_np: Pointer to the phy's device tree node @@ -303,7 +297,7 @@ struct phy_device *of_phy_find_device(struct device_node *phy_np) if (!phy_np) return NULL; - d = bus_find_device(&mdio_bus_type, NULL, phy_np, of_phy_match); + d = bus_find_device_by_fwnode(&mdio_bus_type, NULL, &phy_np->fwnode); if (d) { mdiodev = to_mdio_device(d); if (mdiodev->flags & MDIO_DEVICE_FLAG_PHY) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 6c59673..36dd58e 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -37,11 +37,6 @@ {} /* Empty terminated list */ }; -static int of_dev_node_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /** * of_find_device_by_node - Find the platform_device associated with a node * @np: Pointer to device tree node @@ -55,7 +50,7 @@ struct platform_device *of_find_device_by_node(struct device_node *np) { struct device *dev; - dev = bus_find_device(&platform_bus_type, NULL, np, of_dev_node_match); + dev = bus_find_device_by_fwnode(&platform_bus_type, NULL, &np->fwnode); return dev ? to_platform_device(dev) : NULL; } EXPORT_SYMBOL(of_find_device_by_node); diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9da0bc5..97128a5 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3324,16 +3324,12 @@ int spi_write_then_read(struct spi_device *spi, /*-------------------------------------------------------------------------*/ #if IS_ENABLED(CONFIG_OF_DYNAMIC) -static int __spi_of_device_match(struct device *dev, void *data) -{ - return dev->of_node == data; -} - /* must call put_device() when done with returned spi_device device */ static struct spi_device *of_find_spi_device_by_node(struct device_node *node) { - struct device *dev = bus_find_device(&spi_bus_type, NULL, node, - __spi_of_device_match); + struct device *dev = bus_find_device_by_fwnode(&spi_bus_type, NULL, + &node->fwnode); + return dev ? to_spi_device(dev) : NULL; } -- 1.9.1