Commit a13f7e45 authored by Oliver Crumrine's avatar Oliver Crumrine Committed by Greg Kroah-Hartman
Browse files

staging: octeon: remove typedef in enum cvmx_helper_interface_mode_t 



Remove typedef in enum cvmx_helper_interface_mode_t, and rename all instances
to cvmx_helper_interface_mode

Signed-off-by: default avatarOliver Crumrine <ozlinux@hotmail.com>
Link: https://lore.kernel.org/r/PH7PR11MB7643DEB4401AA83A0578087CBCE0A@PH7PR11MB7643.namprd11.prod.outlook.com


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

drivers/staging/octeon/ethernet.c

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static int cvm_oct_probe(struct platform_device *pdev) 


	num_interfaces = cvmx_helper_get_number_of_interfaces();

	for (interface = 0; interface < num_interfaces; interface++) {

		cvmx_helper_interface_mode_t imode =

		enum cvmx_helper_interface_mode imode =

		    cvmx_helper_interface_get_mode(interface);

		int num_ports = cvmx_helper_ports_on_interface(interface);

		int port;

drivers/staging/octeon/octeon-stubs.h

+4 −4
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ enum cvmx_spi_mode { 
	CVMX_SPI_MODE_DUPLEX = 3

};



typedef enum {

enum cvmx_helper_interface_mode {

	CVMX_HELPER_INTERFACE_MODE_DISABLED,

	CVMX_HELPER_INTERFACE_MODE_RGMII,

	CVMX_HELPER_INTERFACE_MODE_GMII,
@@ -231,7 +231,7 @@ typedef enum { 
	CVMX_HELPER_INTERFACE_MODE_PICMG,

	CVMX_HELPER_INTERFACE_MODE_NPI,

	CVMX_HELPER_INTERFACE_MODE_LOOP,

} cvmx_helper_interface_mode_t;

};



typedef enum {

	CVMX_POW_WAIT = 1,
@@ -1265,7 +1265,7 @@ static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear, 
					    cvmx_pko_port_status_t *status)

{ }



static inline cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int

static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int

								       interface)

{

	return 0;