Commit 930cbb73 authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle

MIPS: Octeon: Remove unused SLI types and macros.

Remove all unused bitfields and macros. Convert the remaining
bitfields to use __BITFIELD_FIELD instead of #ifdef.

[ralf@linux-mips.org: Add inclusions of <uapi/asm/bitfield.h> as necessary.]
Signed-off-by: default avatarSteven J. Hill <steven.hill@cavium.com>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/15405/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 15f68479
...@@ -679,7 +679,7 @@ static void __cvmx_increment_ba(union cvmx_sli_mem_access_subidx *pmas) ...@@ -679,7 +679,7 @@ static void __cvmx_increment_ba(union cvmx_sli_mem_access_subidx *pmas)
if (OCTEON_IS_MODEL(OCTEON_CN68XX)) if (OCTEON_IS_MODEL(OCTEON_CN68XX))
pmas->cn68xx.ba++; pmas->cn68xx.ba++;
else else
pmas->cn63xx.ba++; pmas->s.ba++;
} }
/** /**
...@@ -1351,7 +1351,7 @@ static int __cvmx_pcie_rc_initialize_gen2(int pcie_port) ...@@ -1351,7 +1351,7 @@ static int __cvmx_pcie_rc_initialize_gen2(int pcie_port)
if (OCTEON_IS_MODEL(OCTEON_CN68XX)) if (OCTEON_IS_MODEL(OCTEON_CN68XX))
mem_access_subid.cn68xx.ba = 0; mem_access_subid.cn68xx.ba = 0;
else else
mem_access_subid.cn63xx.ba = 0; mem_access_subid.s.ba = 0;
/* /*
* Setup mem access 12-15 for port 0, 16-19 for port 1, * Setup mem access 12-15 for port 0, 16-19 for port 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment