From patchwork Tue Jan 17 23:21:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 9522279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 280F76043D for ; Tue, 17 Jan 2017 23:55:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 185D12846B for ; Tue, 17 Jan 2017 23:55:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A12C28581; Tue, 17 Jan 2017 23:55:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9CE3E2846B for ; Tue, 17 Jan 2017 23:55:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cTdaw-000715-Lo; Tue, 17 Jan 2017 23:55:18 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTdau-0006zF-Bj for linux-arm-kernel@bombadil.infradead.org; Tue, 17 Jan 2017 23:55:16 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTd5N-0000Io-Qs for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2017 23:22:42 +0000 Received: by mail-pf0-x242.google.com with SMTP id e4so6771537pfg.0 for ; Tue, 17 Jan 2017 15:22:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YcwwXh0IZ1XEZf5fhanCLMEsp61Nwrrey0/HJf6rXsw=; b=SuAOhb210qw/lSNpKFNHUOirgjXBAw7jvyHbf00wNP7AZsrZfoa8SnmzqqeAdZ18w+ k54R7wp9UwCiLRIPSMu7gvy7lPdG736USR46zSo4++0h5CYoXKtxuy6AU+qCBxWcKSkv a9WLc+nyylwzYyol0XpHecJyM55fhkZTzGYz9t0j5d23AEvPgVfQ6xgrzXHmpdjbSLI6 QGCTw9zSVS6MVYOFKHDH0C6wVRSs7Z8w9YROfQzDIkYbULhGmPnUsfaCzR2IZ1SVb77H Bnsp4Wzf3yFnbXh+/FBwX6j4O8e02qAfcdVba1G/u1mgE5teMZXJjoHsUYaorn6EA5lt ue0Q== 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=YcwwXh0IZ1XEZf5fhanCLMEsp61Nwrrey0/HJf6rXsw=; b=gaIK5u61u5HO+8ncHA4shbiQwFeRVyLlRd26UvfxGZFQT9qC8ZRen+8vNHjtoDn4l7 CtAXOvgX7xN5V7enJsSSxB5rKprnucb9orjVobVi3a/H4J5zgq2HM/Lv3Y8KgS07Xx3L ZJ0Jy6hH4rcD3GPpCoOSqXvkGDKccWvyhdj722Un80B0RRnnB7OjIASkAikxpjCuKac/ lTw8s1E/Wbby2D/qJMR0cOz+LNWX/siUmNAMAN/3kEn+z5ETNNxv7JYWOEkdVjngB77H BuPr+SfhfrJdrGltmwPyxPVn25KGbNkxzX8Z8FRmUh4J9QnQ19/pYL2Ge/kkgU5OVJrL Xwdw== X-Gm-Message-State: AIkVDXIqa4qp0O+FqTJtjhnR7SR8PPHDrmvNFsyM8y4Uq5DYeBxb8+Ot+QI1JfrDkufdOA== X-Received: by 10.98.25.21 with SMTP id 21mr246974pfz.46.1484695340088; Tue, 17 Jan 2017 15:22:20 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id w125sm58615705pgb.11.2017.01.17.15.22.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jan 2017 15:22:19 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Subject: [PATCH net-next v4 06/10] net: dsa: Migrate to device_find_in_class_name() Date: Tue, 17 Jan 2017 15:21:48 -0800 Message-Id: <20170117232152.1661-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170117232152.1661-1-f.fainelli@gmail.com> References: <20170117232152.1661-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170117_182241_944341_56233FA4 X-CRM114-Status: GOOD ( 11.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Florian Fainelli , Jason Cooper , Vivien Didelot , Greg Kroah-Hartman , Russell King , open list , Gregory Clement , "David S. Miller" , "moderated list:ARM/Marvell Dove/MV78xx0/Orion SOC support" , Sebastian Hesselbarth MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Now that the base device driver code provides an identical implementation of dev_find_class() utilize device_find_in_class_name() instead of our own version of it. Signed-off-by: Florian Fainelli --- net/dsa/dsa.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 2306d1b87c83..d9db63910887 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -455,29 +455,11 @@ EXPORT_SYMBOL_GPL(dsa_switch_resume); #endif /* platform driver init and cleanup *****************************************/ -static int dev_is_class(struct device *dev, void *class) -{ - if (dev->class != NULL && !strcmp(dev->class->name, class)) - return 1; - - return 0; -} - -static struct device *dev_find_class(struct device *parent, char *class) -{ - if (dev_is_class(parent, class)) { - get_device(parent); - return parent; - } - - return device_find_child(parent, class, dev_is_class); -} - struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev) { struct device *d; - d = dev_find_class(dev, "mdio_bus"); + d = device_find_in_class_name(dev, "mdio_bus"); if (d != NULL) { struct mii_bus *bus; @@ -495,7 +477,7 @@ static struct net_device *dev_to_net_device(struct device *dev) { struct device *d; - d = dev_find_class(dev, "net"); + d = device_find_in_class_name(dev, "net"); if (d != NULL) { struct net_device *nd;