From patchwork Thu Jun 13 11:35:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 166688 Delivered-To: patch@linaro.org Received: by 2002:ac9:2a84:0:0:0:0:0 with SMTP id p4csp813863oca; Thu, 13 Jun 2019 08:27:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwOVrxAIZFtexBpAN2FHYPfef2NHQmiwcBGlv4Z333xIRPuFfXx7UCMFWQTYLHo2OFQhyV8 X-Received: by 2002:a63:4665:: with SMTP id v37mr7314581pgk.52.1560439660126; Thu, 13 Jun 2019 08:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560439660; cv=none; d=google.com; s=arc-20160816; b=dIpzrQTaQRtvTCQVVGvA0mqT4e8Q3YajL9eK3EVZ6KwCcVc8irPFIHyicXUUHNgEjb It3D2azLdG9ycvHCUkP564LTPStHgvc/mpUZtbWObcCWxUDcJW2pwtnaULNInfyOf0FA +AgyAIrK1b78qRhpKoCbNF2Bnw4j/fQ3YCgbs26SZHUsudKSsLHlTkxsMjtsyvOeU0KV GJfPqAJ06oHjkMyLsFptz+bgKtvjCeqDaXWBGDUqdJuY7u4TAS3DDQvubsjdoQQb9AKN ryw3mggKcv0sSjXs6/X/V+hf1hhQocyBdKstq0dHsODaJED5YiPUnyEpsvHqg8TzHUjU rr0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=eIUb7QFUL1xRuXHbQmKp0h/Hfg3SUdrT+TZHlG6xJOU=; b=B0ucSP8z35F+R0DWa2yM3j4+MObK/pEXjmnhbiYxHtIN2v81wKFvvwiJDlqvtVdXRw atkOe5JUsDGHKW6uf65406GjgOjEY0yx+dVs9Ac7EqiWj58kmhradofLsSBKaT+qB6oj XO8O7HZvjIdHT/Bm/z8mqCYT+XxrV48stMUjo2wtvs91pa+fikw31+u2++fLhvm6aqAY pkX36bA5zlHUS7VItEYIvAhsf+/USwpIxoh8KsToMC8UKTbb6ZpQZcVtTG3f8CKCwOG2 ZQDEtmVt6LgSl7/M1/9YgWV8X0rkCiM9J1zTxBiECfDE3x3ejeobJ6+hgfjlJxFSSGbD ykVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lTbgR2Xw; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n11si112216pgi.27.2019.06.13.08.27.39; Thu, 13 Jun 2019 08:27:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lTbgR2Xw; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729370AbfFMP1j (ORCPT + 9 others); Thu, 13 Jun 2019 11:27:39 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:35773 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729013AbfFMLf1 (ORCPT ); Thu, 13 Jun 2019 07:35:27 -0400 Received: by mail-lf1-f66.google.com with SMTP id a25so14815384lfg.2 for ; Thu, 13 Jun 2019 04:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eIUb7QFUL1xRuXHbQmKp0h/Hfg3SUdrT+TZHlG6xJOU=; b=lTbgR2Xwu/whe+o46UX1RhLEox3cGUvTjCYuIrWyUWP7B8w2/vqQ1JEwU8d4RzAOBl pm1I3n7wUNVsmwb75kOj2f4XgoOo90I16rzzqyzmSNV+d0nKj9uTjdAz7i+a1Nc3vo9Q Z1vrTXsWQC6WtLCLAYgRcoalRS/0OaAQJ3alMagVRjXUlIgzjxfqRhCw1nt1XgzncvEe /dDaVsbJ3cRCuK8BFtOz6A7FTh7hVfMKxupY9W+GROwzJqgXj7d4kMVgCCsq9RWzOkJC OXJBxR4NZTC9KVlGZ5uW2zX38Uy/XhFbnv/cW8w+wHiW+EojI4Y1jgNubNYiwslNSS9P rNSQ== 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:mime-version :content-transfer-encoding; bh=eIUb7QFUL1xRuXHbQmKp0h/Hfg3SUdrT+TZHlG6xJOU=; b=ZJmjLy2F2n7J5CGLBW5g5WNaG7ps8mfN6x88t+jR/rNd3SKhNnqogrtuk46gAkeTbn ECedgWOUqpX9tWd7Bhq0iD+b43NpfK/N1QYzAH0Ao3SnybDMpb/mIoGealQEZyow1pd8 A8ZTu+YHGjC38mIK772jLST+M9aO4Zb9JSdLPOy4gpnkyem8jSAV3bVRvnH2vF/4Dwt4 qlvczPJCkH9Vtzezy+t8oXbYagltZxJTdWFP7vziP9tD6urs05HYUMF8sz/Kozka+FWx ze5qES+JCL9Mg/UGbhBa/3KpNy6tcV5GMsl8+2W/SrlY28gYcdNEEFPLtN3T1ujYuiSs cf4A== X-Gm-Message-State: APjAAAUCsCsArfG2N9BH+tQt1YghjQTOnXyY4/3E4Hb88AGL92JmgdPg U4tKqD6GPMEOppjl3R3Gxe81UQ== X-Received: by 2002:ac2:4202:: with SMTP id y2mr26100657lfh.178.1560425724489; Thu, 13 Jun 2019 04:35:24 -0700 (PDT) Received: from localhost (c-1c3670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.28]) by smtp.gmail.com with ESMTPSA id r2sm541985lfi.51.2019.06.13.04.35.23 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 13 Jun 2019 04:35:23 -0700 (PDT) From: Anders Roxell To: davem@davemloft.net Cc: andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com, linus.walleij@linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Anders Roxell Subject: [PATCH v3] net: dsa: fix warning same module names Date: Thu, 13 Jun 2019 13:35:03 +0200 Message-Id: <20190613113503.4839-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When building with CONFIG_NET_DSA_REALTEK_SMI and CONFIG_REALTEK_PHY enabled as loadable modules, we see the following warning: warning: same module names found: drivers/net/phy/realtek.ko drivers/net/dsa/realtek.ko Rework so the driver name is realtek-smi instead of realtek. Reviewed-by: Linus Walleij Reviewed-by: Andrew Lunn Signed-off-by: Anders Roxell --- drivers/net/dsa/Makefile | 4 ++-- drivers/net/dsa/{realtek-smi.c => realtek-smi-core.c} | 2 +- drivers/net/dsa/{realtek-smi.h => realtek-smi-core.h} | 0 drivers/net/dsa/rtl8366.c | 2 +- drivers/net/dsa/rtl8366rb.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename drivers/net/dsa/{realtek-smi.c => realtek-smi-core.c} (99%) rename drivers/net/dsa/{realtek-smi.h => realtek-smi-core.h} (100%) -- 2.20.1 diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile index fefb6aaa82ba..d99dc6de0006 100644 --- a/drivers/net/dsa/Makefile +++ b/drivers/net/dsa/Makefile @@ -9,8 +9,8 @@ obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o obj-$(CONFIG_NET_DSA_MT7530) += mt7530.o obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o obj-$(CONFIG_NET_DSA_QCA8K) += qca8k.o -obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek.o -realtek-objs := realtek-smi.o rtl8366.o rtl8366rb.o +obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek-smi.o +realtek-smi-objs := realtek-smi-core.o rtl8366.o rtl8366rb.o obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o diff --git a/drivers/net/dsa/realtek-smi.c b/drivers/net/dsa/realtek-smi-core.c similarity index 99% rename from drivers/net/dsa/realtek-smi.c rename to drivers/net/dsa/realtek-smi-core.c index ad41ec63cc9f..dc0509c02d29 100644 --- a/drivers/net/dsa/realtek-smi.c +++ b/drivers/net/dsa/realtek-smi-core.c @@ -40,7 +40,7 @@ #include #include -#include "realtek-smi.h" +#include "realtek-smi-core.h" #define REALTEK_SMI_ACK_RETRY_COUNT 5 #define REALTEK_SMI_HW_STOP_DELAY 25 /* msecs */ diff --git a/drivers/net/dsa/realtek-smi.h b/drivers/net/dsa/realtek-smi-core.h similarity index 100% rename from drivers/net/dsa/realtek-smi.h rename to drivers/net/dsa/realtek-smi-core.h diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c index 6dedd43442cc..fe5d976b0b10 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -11,7 +11,7 @@ #include #include -#include "realtek-smi.h" +#include "realtek-smi-core.h" int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used) { diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c index 40b3974970c6..a268085ffad2 100644 --- a/drivers/net/dsa/rtl8366rb.c +++ b/drivers/net/dsa/rtl8366rb.c @@ -20,7 +20,7 @@ #include #include -#include "realtek-smi.h" +#include "realtek-smi-core.h" #define RTL8366RB_PORT_NUM_CPU 5 #define RTL8366RB_NUM_PORTS 6