2020-05-06 13:46:43

by Jason Yan

Subject: [PATCH] MIPS: Octeon: Remove dead code in __cvmx_helper_npi_probe()

This code has been marked dead for more than 10 years. Seems no need to
keep it now.

Signed-off-by: Jason Yan <[email protected]>
---
arch/mips/cavium-octeon/executive/cvmx-helper-npi.c | 12 ------------
1 file changed, 12 deletions(-)

diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-npi.c b/arch/mips/cavium-octeon/executive/cvmx-helper-npi.c
index cc94cfa545b4..cb210d2ef0c4 100644
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-npi.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-npi.c
@@ -59,18 +59,6 @@ int __cvmx_helper_npi_probe(int interface)
&& !OCTEON_IS_MODEL(OCTEON_CN52XX_PASS1_X))
/* The packet engines didn't exist before pass 2 */
return 4;
-#if 0
- /*
- * Technically CN30XX, CN31XX, and CN50XX contain packet
- * engines, but nobody ever uses them. Since this is the case,
- * we disable them here.
- */
- else if (OCTEON_IS_MODEL(OCTEON_CN31XX)
- || OCTEON_IS_MODEL(OCTEON_CN50XX))
- return 2;
- else if (OCTEON_IS_MODEL(OCTEON_CN30XX))
- return 1;
-#endif
#endif
return 0;
}
--
2.21.1

2020-05-07 08:41:35

by Thomas Bogendoerfer

Subject: Re: [PATCH] MIPS: Octeon: Remove dead code in __cvmx_helper_npi_probe()

On Wed, May 06, 2020 at 09:43:15PM +0800, Jason Yan wrote:
> This code has been marked dead for more than 10 years. Seems no need to
> keep it now.
>
> Signed-off-by: Jason Yan <[email protected]>
> ---
> arch/mips/cavium-octeon/executive/cvmx-helper-npi.c | 12 ------------
> 1 file changed, 12 deletions(-)

appled to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]