Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752522AbbEATiM (ORCPT ); Fri, 1 May 2015 15:38:12 -0400 Received: from filtteri6.pp.htv.fi ([213.243.153.189]:35971 "EHLO filtteri6.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbbEATiB (ORCPT ); Fri, 1 May 2015 15:38:01 -0400 From: Aaro Koskinen To: Greg Kroah-Hartman , Ralf Baechle , David Daney , David Daney Cc: devel@driverdev.osuosl.org, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Aaro Koskinen Subject: [RFC PATCH 07/11] MIPS: OCTEON: make all interface enumeration helpers static Date: Fri, 1 May 2015 22:37:09 +0300 Message-Id: <1430509033-12113-8-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1430509033-12113-1-git-send-email-aaro.koskinen@iki.fi> References: <1430509033-12113-1-git-send-email-aaro.koskinen@iki.fi> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5397 Lines: 144 Make all interface enumeration helpers static. Signed-off-by: Aaro Koskinen --- arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +++++----- arch/mips/include/asm/octeon/cvmx-helper-npi.h | 11 ----------- arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 9 --------- arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 1 - arch/mips/include/asm/octeon/cvmx-helper-spi.h | 1 - arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 1 - 6 files changed, 5 insertions(+), 28 deletions(-) diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c index c0c541b..414ca1a 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c @@ -316,7 +316,7 @@ static int __cvmx_helper_loop_enumerate(int interface) * * Returns Number of ports on the interface. Zero to disable. */ -int __cvmx_helper_npi_enumerate(int interface) +static int __cvmx_helper_npi_enumerate(int interface) { #if CVMX_PKO_QUEUES_PER_PORT_PCI > 0 if (OCTEON_IS_MODEL(OCTEON_CN38XX) || OCTEON_IS_MODEL(OCTEON_CN58XX)) @@ -352,7 +352,7 @@ int __cvmx_helper_npi_enumerate(int interface) * * Returns Number of RGMII/GMII/MII ports (0-4). */ -int __cvmx_helper_rgmii_enumerate(int interface) +static int __cvmx_helper_rgmii_enumerate(int interface) { int num_ports = 0; union cvmx_gmxx_inf_mode mode; @@ -391,12 +391,12 @@ int __cvmx_helper_rgmii_enumerate(int interface) return num_ports; } -int __cvmx_helper_sgmii_enumerate(int interface) +static int __cvmx_helper_sgmii_enumerate(int interface) { return 4; } -int __cvmx_helper_spi_enumerate(int interface) +static int __cvmx_helper_spi_enumerate(int interface) { if ((cvmx_sysinfo_get()->board_type != CVMX_BOARD_TYPE_SIM) && cvmx_spi4000_is_present(interface)) { @@ -406,7 +406,7 @@ int __cvmx_helper_spi_enumerate(int interface) } } -int __cvmx_helper_xaui_enumerate(int interface) +static int __cvmx_helper_xaui_enumerate(int interface) { union cvmx_gmxx_hg2_control gmx_hg2_control; diff --git a/arch/mips/include/asm/octeon/cvmx-helper-npi.h b/arch/mips/include/asm/octeon/cvmx-helper-npi.h index bab9931..84a94ee 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-npi.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-npi.h @@ -36,17 +36,6 @@ #define __CVMX_HELPER_NPI_H__ /** - * Enumerate a NPI interface and determine the number of ports - * connected to it. The NPI interface should still be down after - * this call. - * - * @interface: Interface to enumerate - * - * Returns Number of ports on the interface. Zero to disable. - */ -extern int __cvmx_helper_npi_enumerate(int interface); - -/** * Bringup and enable a NPI interface. After this call packet * I/O should be fully functional. This is called with IPD * enabled but PKO disabled. diff --git a/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h index df7717b..7dfe5f5 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h @@ -36,15 +36,6 @@ #define __CVMX_HELPER_RGMII_H__ /** - * Enumerate RGMII ports and determine the number present - * - * @interface: Interface to enumerate - * - * Returns Number of RGMII/GMII/MII ports (0-4). - */ -extern int __cvmx_helper_rgmii_enumerate(int interface); - -/** * Put an RGMII interface in loopback mode. Internal packets sent * out will be received back again on the same port. Externally * received packets will echo back out. diff --git a/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h index eb51835..f4c9eb1 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h @@ -45,7 +45,6 @@ * Returns Number of ports on the interface. Zero to disable. */ extern void __cvmx_helper_sgmii_probe(int interface); -extern int __cvmx_helper_sgmii_enumerate(int interface); /** * Bringup and enable a SGMII interface. After this call packet diff --git a/arch/mips/include/asm/octeon/cvmx-helper-spi.h b/arch/mips/include/asm/octeon/cvmx-helper-spi.h index 9f1c6b9..69bac03 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-spi.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-spi.h @@ -42,7 +42,6 @@ * Returns Number of ports on the interface. Zero to disable. */ extern int __cvmx_helper_spi_probe(int interface); -extern int __cvmx_helper_spi_enumerate(int interface); /** * Bringup and enable a SPI interface. After this call packet I/O diff --git a/arch/mips/include/asm/octeon/cvmx-helper-xaui.h b/arch/mips/include/asm/octeon/cvmx-helper-xaui.h index 9fbcea3..c392808 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-xaui.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-xaui.h @@ -45,7 +45,6 @@ * Returns Number of ports on the interface. Zero to disable. */ extern void __cvmx_helper_xaui_probe(int interface); -extern int __cvmx_helper_xaui_enumerate(int interface); /** * Bringup and enable a XAUI interface. After this call packet -- 2.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/