Commit f7d2bdcb authored by Chris Packham's avatar Chris Packham Committed by Greg Kroah-Hartman
Browse files

MIPS: octeon: remove typedef declaration for cvmx_helper_link_info 



Remove declaration of union cvmx_helper_link_info as typedef and update
uses to use the union.

Signed-off-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20200205001116.14096-5-chris.packham@alliedtelesis.co.nz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9546de4

arch/mips/cavium-octeon/executive/cvmx-helper-board.c

+2 −2
Original line number Diff line number Diff line
@@ -207,9 +207,9 @@ int cvmx_helper_board_get_mii_address(int ipd_port) 
 * Returns The ports link status. If the link isn't fully resolved, this must

 *	   return zero.

 */

cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port)

union cvmx_helper_link_info __cvmx_helper_board_link_get(int ipd_port)

{

	cvmx_helper_link_info_t result;

	union cvmx_helper_link_info result;



	WARN(!octeon_is_simulation(),

	     "Using deprecated link status - please update your DT");

arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c

+3 −3
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ int __cvmx_helper_rgmii_enable(int interface) 
 *

 * Returns Link state

 */

cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port)

union cvmx_helper_link_info __cvmx_helper_rgmii_link_get(int ipd_port)

{

	int interface = cvmx_helper_get_interface_num(ipd_port);

	int index = cvmx_helper_get_interface_index_num(ipd_port);
@@ -270,7 +270,7 @@ cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port) 
	asxx_prt_loop.u64 = cvmx_read_csr(CVMX_ASXX_PRT_LOOP(interface));

	if (asxx_prt_loop.s.int_loop & (1 << index)) {

		/* Force 1Gbps full duplex on internal loopback */

		cvmx_helper_link_info_t result;

		union cvmx_helper_link_info result;

		result.u64 = 0;

		result.s.full_duplex = 1;

		result.s.link_up = 1;
@@ -292,7 +292,7 @@ cvmx_helper_link_info_t __cvmx_helper_rgmii_link_get(int ipd_port) 
 * Returns Zero on success, negative on failure

 */

int __cvmx_helper_rgmii_link_set(int ipd_port,

				 cvmx_helper_link_info_t link_info)

				 union cvmx_helper_link_info link_info)

{

	int result = 0;

	int interface = cvmx_helper_get_interface_num(ipd_port);

arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c

+4 −4
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int __cvmx_helper_sgmii_hardware_init_link(int interface, int index) 
 */

static int __cvmx_helper_sgmii_hardware_init_link_speed(int interface,

							int index,

							cvmx_helper_link_info_t

							union cvmx_helper_link_info

							link_info)

{

	int is_enabled;
@@ -394,9 +394,9 @@ int __cvmx_helper_sgmii_enable(int interface) 
 *

 * Returns Link state

 */

cvmx_helper_link_info_t __cvmx_helper_sgmii_link_get(int ipd_port)

union cvmx_helper_link_info __cvmx_helper_sgmii_link_get(int ipd_port)

{

	cvmx_helper_link_info_t result;

	union cvmx_helper_link_info result;

	union cvmx_pcsx_miscx_ctl_reg pcs_misc_ctl_reg;

	int interface = cvmx_helper_get_interface_num(ipd_port);

	int index = cvmx_helper_get_interface_index_num(ipd_port);
@@ -505,7 +505,7 @@ cvmx_helper_link_info_t __cvmx_helper_sgmii_link_get(int ipd_port) 
 * Returns Zero on success, negative on failure

 */

int __cvmx_helper_sgmii_link_set(int ipd_port,

				 cvmx_helper_link_info_t link_info)

				 union cvmx_helper_link_info link_info)

{

	int interface = cvmx_helper_get_interface_num(ipd_port);

	int index = cvmx_helper_get_interface_index_num(ipd_port);

arch/mips/cavium-octeon/executive/cvmx-helper-spi.c

+3 −3
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ int __cvmx_helper_spi_enable(int interface) 
 *

 * Returns Link state

 */

cvmx_helper_link_info_t __cvmx_helper_spi_link_get(int ipd_port)

union cvmx_helper_link_info __cvmx_helper_spi_link_get(int ipd_port)

{

	cvmx_helper_link_info_t result;

	union cvmx_helper_link_info result;

	int interface = cvmx_helper_get_interface_num(ipd_port);

	int index = cvmx_helper_get_interface_index_num(ipd_port);

	result.u64 = 0;
@@ -193,7 +193,7 @@ cvmx_helper_link_info_t __cvmx_helper_spi_link_get(int ipd_port) 
 *

 * Returns Zero on success, negative on failure

 */

int __cvmx_helper_spi_link_set(int ipd_port, cvmx_helper_link_info_t link_info)

int __cvmx_helper_spi_link_set(int ipd_port, union cvmx_helper_link_info link_info)

{

	/* Nothing to do. If we have a SPI4000 then the setup was already performed

	   by cvmx_spi4000_check_speed(). If not then there isn't any link

arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c

+3 −3
Original line number Diff line number Diff line
@@ -259,13 +259,13 @@ int __cvmx_helper_xaui_enable(int interface) 
 *

 * Returns Link state

 */

cvmx_helper_link_info_t __cvmx_helper_xaui_link_get(int ipd_port)

union cvmx_helper_link_info __cvmx_helper_xaui_link_get(int ipd_port)

{

	int interface = cvmx_helper_get_interface_num(ipd_port);

	union cvmx_gmxx_tx_xaui_ctl gmxx_tx_xaui_ctl;

	union cvmx_gmxx_rx_xaui_ctl gmxx_rx_xaui_ctl;

	union cvmx_pcsxx_status1_reg pcsxx_status1_reg;

	cvmx_helper_link_info_t result;

	union cvmx_helper_link_info result;



	gmxx_tx_xaui_ctl.u64 = cvmx_read_csr(CVMX_GMXX_TX_XAUI_CTL(interface));

	gmxx_rx_xaui_ctl.u64 = cvmx_read_csr(CVMX_GMXX_RX_XAUI_CTL(interface));
@@ -299,7 +299,7 @@ cvmx_helper_link_info_t __cvmx_helper_xaui_link_get(int ipd_port) 
 *

 * Returns Zero on success, negative on failure

 */

int __cvmx_helper_xaui_link_set(int ipd_port, cvmx_helper_link_info_t link_info)

int __cvmx_helper_xaui_link_set(int ipd_port, union cvmx_helper_link_info link_info)

{

	int interface = cvmx_helper_get_interface_num(ipd_port);

	union cvmx_gmxx_tx_xaui_ctl gmxx_tx_xaui_ctl;

CRA Git | Maintained and supported by SUSTech CRA and CCSE