From patchwork Sat Jan 14 21:47:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 9517131 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 BB8EA60762 for ; Sat, 14 Jan 2017 21:49:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB37F2844A for ; Sat, 14 Jan 2017 21:49:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C84328456; Sat, 14 Jan 2017 21:49:12 +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=unavailable 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 524492844A for ; Sat, 14 Jan 2017 21:49:12 +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 1cSWCE-0002G8-3a; Sat, 14 Jan 2017 21:49:10 +0000 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cSWAz-0000Dd-EU for linux-arm-kernel@lists.infradead.org; Sat, 14 Jan 2017 21:47:55 +0000 Received: by mail-qt0-x243.google.com with SMTP id l7so10333282qtd.3 for ; Sat, 14 Jan 2017 13:47:32 -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=fY3Gd0Uvylj9w8ToOX4wnzY9X2UykStEuHNJUsyEMZY=; b=qXBe81yb/eiO1iY94jLeDqDF6/DlPa3c4BhLAEnYR62EMSIL+L+kSJcZSfo1gWPN2h 8T8uLTN5W0/9P0mEk1G04Earb//eQBty8O+XY0OgeKiTmEt2fqnyop/VErfdUEVu01ep w6ZZ6fCWzFjvfaGxbVq2l0gdVFH1uA1+tThMb1RmZEYRZMKXqdudg3RCnv7O3uUltVDv 4jERZkZ61iC3NVSUbjQ+8GyzAKFm/pHV0vAbsH3Vn4VRT7ntjEeXI2Bhluxl2koMte2U SKgd+cNW5pJo+hvJWcNgKpXS6UuaVIDb0j3Tejvj8xhfv2ag8dO1VkHOq4Og/lk9PVpx FpIw== 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=fY3Gd0Uvylj9w8ToOX4wnzY9X2UykStEuHNJUsyEMZY=; b=PBD06Oofnh8s5jaHqAJr/ujQRsAIlmpHcYszjtdLZ2AzBc8ttTZ4JAJyOzEKufJk3l d76wuxGIyO6ws9jSiG93Zx1QeMfYi5COHVGognOTIH5QluoklUmVDrYnpJUhUqN3WwWB iM2C4g+/vPbtrU/W1TrV0W0MVmgXz3RXiR5Ni44/j7DOYFRb2EdEYBZl5y/ajzkcwcUz kWakwJMq9fOrWF7ae6yH1drETDWQ8oCEvY0j0imRz/tnoRjXkCx/1j7bvNQuj8JKzT8A rJCPT3gulZobzybKu9mut2B5uWSgnh6iNFJvwJiYi/j0t1PPR80kF/t81WeqJTcvESl6 Y4DQ== X-Gm-Message-State: AIkVDXLMU8xvwnVh8Z1NU3+sonpPY3wYrAdIh8Lf+WnNokSP77rOSwpqCYPduuIlAMG8VQ== X-Received: by 10.200.50.112 with SMTP id y45mr22482896qta.108.1484430452151; Sat, 14 Jan 2017 13:47:32 -0800 (PST) Received: from fainelli-laptop.vpn.broadcom.net ([2001:470:d:73f:b16f:f382:be58:4136]) by smtp.gmail.com with ESMTPSA id p20sm1113258qte.46.2017.01.14.13.47.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Jan 2017 13:47:31 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Subject: [PATCH net-next v3 07/10] net: Relocate dev_to_net_device() into core Date: Sat, 14 Jan 2017 13:47:10 -0800 Message-Id: <20170114214713.28109-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170114214713.28109-1-f.fainelli@gmail.com> References: <20170114214713.28109-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170114_134753_618243_0C7EE147 X-CRM114-Status: GOOD ( 12.66 ) 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 , gregkh@linuxfoundation.org, Russell King , open list , Gregory Clement , "David S. Miller" , "moderated list:ARM SUB-ARCHITECTURES" , 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 dev_to_net_device() is moved from net/dsa/dsa.c to net/core/dev.c since it going to be used by net/dsa/dsa2.c and the namespace of the function justifies making it available to other users potentially. Signed-off-by: Florian Fainelli --- include/linux/netdevice.h | 2 ++ net/core/dev.c | 19 +++++++++++++++++++ net/dsa/dsa.c | 18 ------------------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 97ae0ac513ee..6d021c37b774 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4390,4 +4390,6 @@ do { \ #define PTYPE_HASH_SIZE (16) #define PTYPE_HASH_MASK (PTYPE_HASH_SIZE - 1) +struct net_device *dev_to_net_device(struct device *dev); + #endif /* _LINUX_NETDEVICE_H */ diff --git a/net/core/dev.c b/net/core/dev.c index ad5959e56116..7547e2ccc06b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8128,6 +8128,25 @@ const char *netdev_drivername(const struct net_device *dev) return empty; } +struct net_device *dev_to_net_device(struct device *dev) +{ + struct device *d; + + d = device_find_class(dev, "net"); + if (d) { + struct net_device *nd; + + nd = to_net_dev(d); + dev_hold(nd); + put_device(d); + + return nd; + } + + return NULL; +} +EXPORT_SYMBOL_GPL(dev_to_net_device); + static void __netdev_printk(const char *level, const struct net_device *dev, struct va_format *vaf) { diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 77fa4c4f5828..6c264f92fec5 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -473,24 +473,6 @@ struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev) } EXPORT_SYMBOL_GPL(dsa_host_dev_to_mii_bus); -static struct net_device *dev_to_net_device(struct device *dev) -{ - struct device *d; - - d = device_find_class(dev, "net"); - if (d != NULL) { - struct net_device *nd; - - nd = to_net_dev(d); - dev_hold(nd); - put_device(d); - - return nd; - } - - return NULL; -} - #ifdef CONFIG_OF static int dsa_of_setup_routing_table(struct dsa_platform_data *pd, struct dsa_chip_data *cd,