linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Ralf Baechle <ralf@linux-mips.org>,
	David Daney <ddaney.cavm@gmail.com>,
	David Daney <david.daney@cavium.com>
Cc: devel@driverdev.osuosl.org, linux-mips@linux-mips.org,
	linux-kernel@vger.kernel.org,
	Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: [RFC PATCH 06/11] MIPS: OCTEON: rename __cvmx_helper_npi/rgmii_probe
Date: Fri,  1 May 2015 22:37:08 +0300	[thread overview]
Message-ID: <1430509033-12113-7-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1430509033-12113-1-git-send-email-aaro.koskinen@iki.fi>

Rename __cvmx_helper_npi/rgmii_probe to __cvmx_helper_npi/rgmii_enumerate
as only latter are used.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/mips/cavium-octeon/executive/cvmx-helper.c  | 12 ++++++------
 arch/mips/include/asm/octeon/cvmx-helper-npi.h   |  7 +++----
 arch/mips/include/asm/octeon/cvmx-helper-rgmii.h |  7 +++----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c
index de6e619..c0c541b 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -308,15 +308,15 @@ static int __cvmx_helper_loop_enumerate(int interface)
 }
 
 /**
- * Probe a NPI interface and determine the number of ports
+ * 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 probe
+ * @interface: Interface to enumerate
  *
  * Returns Number of ports on the interface. Zero to disable.
  */
-int __cvmx_helper_npi_probe(int interface)
+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))
@@ -346,13 +346,13 @@ int __cvmx_helper_npi_probe(int interface)
 }
 
 /**
- * Probe RGMII ports and determine the number present
+ * Enumerate RGMII ports and determine the number present
  *
- * @interface: Interface to probe
+ * @interface: Interface to enumerate
  *
  * Returns Number of RGMII/GMII/MII ports (0-4).
  */
-int __cvmx_helper_rgmii_probe(int interface)
+int __cvmx_helper_rgmii_enumerate(int interface)
 {
 	int num_ports = 0;
 	union cvmx_gmxx_inf_mode mode;
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-npi.h b/arch/mips/include/asm/octeon/cvmx-helper-npi.h
index 8df4c7f..bab9931 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-npi.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-npi.h
@@ -36,16 +36,15 @@
 #define __CVMX_HELPER_NPI_H__
 
 /**
- * Probe a NPI interface and determine the number of ports
+ * 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 probe
+ * @interface: Interface to enumerate
  *
  * Returns Number of ports on the interface. Zero to disable.
  */
-extern int __cvmx_helper_npi_probe(int interface);
-#define __cvmx_helper_npi_enumerate __cvmx_helper_npi_probe
+extern int __cvmx_helper_npi_enumerate(int interface);
 
 /**
  * Bringup and enable a NPI interface. After this call packet
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
index 4d7a3db..df7717b 100644
--- a/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
@@ -36,14 +36,13 @@
 #define __CVMX_HELPER_RGMII_H__
 
 /**
- * Probe RGMII ports and determine the number present
+ * Enumerate RGMII ports and determine the number present
  *
- * @interface: Interface to probe
+ * @interface: Interface to enumerate
  *
  * Returns Number of RGMII/GMII/MII ports (0-4).
  */
-extern int __cvmx_helper_rgmii_probe(int interface);
-#define __cvmx_helper_rgmii_enumerate __cvmx_helper_rgmii_probe
+extern int __cvmx_helper_rgmii_enumerate(int interface);
 
 /**
  * Put an RGMII interface in loopback mode. Internal packets sent
-- 
2.3.3


  parent reply	other threads:[~2015-05-01 19:40 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-01 19:37 [RFC PATCH 00/11] MIPS: OCTEON: move all octeon-ethernet code to staging Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 01/11] MIPS: OCTEON: cvmx-helper: use function to access interface_port_count Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 02/11] MIPS: OCTEON: move ethernet-specific helpers into a separate file Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 03/11] MIPS: OCTEON: make __cvmx_helper_sgmii/xaui_probe void Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 04/11] MIPS: OCTEON: move interface enumeration helpers to cvmx-helper Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 05/11] MIPS: OCTEON: delete calls to __cvmx_helper_npi/rgmii_probe Aaro Koskinen
2015-05-01 19:37 ` Aaro Koskinen [this message]
2015-05-01 19:37 ` [RFC PATCH 07/11] MIPS: OCTEON: make all interface enumeration helpers static Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 08/11] MIPS: OCTEON: move the link helpers into a separate file Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 09/11] MIPS: OCTEON: move ethernet-specific helpers to staging Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 10/11] MIPS: OCTEON: ethernet: delete unneeded symbol exports Aaro Koskinen
2015-05-01 19:37 ` [RFC PATCH 11/11] MIPS: OCTEON: move all ethernet-specific headers to staging Aaro Koskinen
2015-05-01 20:55 ` [RFC PATCH 00/11] MIPS: OCTEON: move all octeon-ethernet code " Greg Kroah-Hartman

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=1430509033-12113-7-git-send-email-aaro.koskinen@iki.fi \
    --to=aaro.koskinen@iki.fi \
    --cc=david.daney@cavium.com \
    --cc=ddaney.cavm@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.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;
as well as URLs for NNTP newsgroup(s).