Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752218AbbEATh6 (ORCPT ); Fri, 1 May 2015 15:37:58 -0400 Received: from filtteri1.pp.htv.fi ([213.243.153.184]:42181 "EHLO filtteri1.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbbEAThz (ORCPT ); Fri, 1 May 2015 15:37:55 -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 03/11] MIPS: OCTEON: make __cvmx_helper_sgmii/xaui_probe void Date: Fri, 1 May 2015 22:37:05 +0300 Message-Id: <1430509033-12113-4-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: 3489 Lines: 93 Make __cvmx_helper_sgmii/xaui_probe void, nobody is using return values and this makes functions independent of enumeration functions. Signed-off-by: Aaro Koskinen --- arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c | 5 +---- arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c | 5 +---- arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 2 +- arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c b/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c index 6f9609e..6a47b04 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c @@ -340,10 +340,8 @@ int __cvmx_helper_sgmii_enumerate(int interface) * this call. * * @interface: Interface to probe - * - * Returns Number of ports on the interface. Zero to disable. */ -int __cvmx_helper_sgmii_probe(int interface) +void __cvmx_helper_sgmii_probe(int interface) { union cvmx_gmxx_inf_mode mode; @@ -355,7 +353,6 @@ int __cvmx_helper_sgmii_probe(int interface) mode.u64 = cvmx_read_csr(CVMX_GMXX_INF_MODE(interface)); mode.s.en = 1; cvmx_write_csr(CVMX_GMXX_INF_MODE(interface), mode.u64); - return __cvmx_helper_sgmii_enumerate(interface); } /** diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c index 7653b7e..49d7507 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c @@ -63,10 +63,8 @@ int __cvmx_helper_xaui_enumerate(int interface) * after this call. * * @interface: Interface to probe - * - * Returns Number of ports on the interface. Zero to disable. */ -int __cvmx_helper_xaui_probe(int interface) +void __cvmx_helper_xaui_probe(int interface) { int i; union cvmx_gmxx_inf_mode mode; @@ -102,7 +100,6 @@ int __cvmx_helper_xaui_probe(int interface) pko_mem_port_ptrs.s.pid = interface * 16 + i; cvmx_write_csr(CVMX_PKO_MEM_PORT_PTRS, pko_mem_port_ptrs.u64); } - return __cvmx_helper_xaui_enumerate(interface); } /** diff --git a/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h b/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h index 4debb1c..eb51835 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-sgmii.h @@ -44,7 +44,7 @@ * * Returns Number of ports on the interface. Zero to disable. */ -extern int __cvmx_helper_sgmii_probe(int interface); +extern void __cvmx_helper_sgmii_probe(int interface); extern int __cvmx_helper_sgmii_enumerate(int interface); /** diff --git a/arch/mips/include/asm/octeon/cvmx-helper-xaui.h b/arch/mips/include/asm/octeon/cvmx-helper-xaui.h index 5e89ed7..9fbcea3 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-xaui.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-xaui.h @@ -44,7 +44,7 @@ * * Returns Number of ports on the interface. Zero to disable. */ -extern int __cvmx_helper_xaui_probe(int interface); +extern void __cvmx_helper_xaui_probe(int interface); extern int __cvmx_helper_xaui_enumerate(int interface); /** -- 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/