From: Kishon Vijay Abraham I <kishon@ti.com>
To: <kishon@ti.com>, <lho@apm.com>
Cc: <linux-kernel@vger.kernel.org>, <david@lechnology.com>
Subject: [PATCH] phy: xgene: rename "enum phy_mode" to "enum xgene_phy_mode"
Date: Tue, 28 Jun 2016 14:57:32 +0530 [thread overview]
Message-ID: <1467106052-21501-1-git-send-email-kishon@ti.com> (raw)
commit 96284c53246f ("phy: Add set_mode callback") introduced
enum phy_mode in phy_core. This introduced the following build
error.
drivers/phy/phy-xgene.c:521:6: error: nested redefinition of 'enum phy_mode'
enum phy_mode {
^
drivers/phy/phy-xgene.c:521:6: error: redeclaration of 'enum phy_mode'
In file included from drivers/phy/phy-xgene.c:57:0:
include/linux/phy/phy.h:25:6: note: originally defined here
enum phy_mode {
^
Fix it here.
Fixes: 96284c53246f ("phy: Add set_mode callback")
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/phy/phy-xgene.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/phy/phy-xgene.c b/drivers/phy/phy-xgene.c
index 385362e..ae266e0 100644
--- a/drivers/phy/phy-xgene.c
+++ b/drivers/phy/phy-xgene.c
@@ -518,7 +518,7 @@ enum clk_type_t {
CLK_INT_SING = 2, /* Internal single ended */
};
-enum phy_mode {
+enum xgene_phy_mode {
MODE_SATA = 0, /* List them for simple reference */
MODE_SGMII = 1,
MODE_PCIE = 2,
@@ -542,7 +542,7 @@ struct xgene_sata_override_param {
struct xgene_phy_ctx {
struct device *dev;
struct phy *phy;
- enum phy_mode mode; /* Mode of operation */
+ enum xgene_phy_mode mode; /* Mode of operation */
enum clk_type_t clk_type; /* Input clock selection */
void __iomem *sds_base; /* PHY CSR base addr */
struct clk *clk; /* Optional clock */
--
1.7.9.5
next reply other threads:[~2016-06-28 9:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-28 9:27 Kishon Vijay Abraham I [this message]
2016-06-28 19:57 ` Loc Ho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467106052-21501-1-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=david@lechnology.com \
--cc=lho@apm.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®