diff mbox

phy: xgene: rename "enum phy_mode" to "enum xgene_phy_mode"

Message ID 1467106052-21501-1-git-send-email-kishon@ti.com
State Superseded
Headers show

Commit Message

Kishon Vijay Abraham I June 28, 2016, 9:27 a.m. UTC 
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(-)

-- 
1.7.9.5
diff mbox

Patch

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 */