From patchwork Tue Jun 28 09:27:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 70985 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1485006qgy; Tue, 28 Jun 2016 02:28:29 -0700 (PDT) X-Received: by 10.98.9.141 with SMTP id 13mr146554pfj.130.1467106108914; Tue, 28 Jun 2016 02:28:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 134si631750pfb.253.2016.06.28.02.28.28; Tue, 28 Jun 2016 02:28:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752430AbcF1J21 (ORCPT + 30 others); Tue, 28 Jun 2016 05:28:27 -0400 Received: from arroyo.ext.ti.com ([198.47.19.12]:52659 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752172AbcF1J2Z (ORCPT ); Tue, 28 Jun 2016 05:28:25 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id u5S9Raru010041; Tue, 28 Jun 2016 04:27:36 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id u5S9RaGM003097; Tue, 28 Jun 2016 04:27:36 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Tue, 28 Jun 2016 04:27:36 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u5S9RXXN005212; Tue, 28 Jun 2016 04:27:34 -0500 From: Kishon Vijay Abraham I To: , CC: , Subject: [PATCH] phy: xgene: rename "enum phy_mode" to "enum xgene_phy_mode" Date: Tue, 28 Jun 2016 14:57:32 +0530 Message-ID: <1467106052-21501-1-git-send-email-kishon@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/phy/phy-xgene.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.7.9.5 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 */