Commit 3db9eb6d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: octeon: remove typedef in enum cvmx_helper_interface_mode_t" 

This reverts commit a13f7e45.

The patch series that removed typedefs from the octeon driver was not
actually built properly, and broke the build (it's hard to test-build
this driver for some reason.)  Remove them all at this point in time to
make sure the build works properly.

Link: https://lore.kernel.org/r/32e9ad3c-191e-4dd1-b1cc-07f7b93c3f28@roeck-us.net


Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Oliver Crumrine <ozlinux@hotmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8fecfe8

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++) {

		enum cvmx_helper_interface_mode imode =

		cvmx_helper_interface_mode_t 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

};



enum cvmx_helper_interface_mode {

typedef enum {

	CVMX_HELPER_INTERFACE_MODE_DISABLED,

	CVMX_HELPER_INTERFACE_MODE_RGMII,

	CVMX_HELPER_INTERFACE_MODE_GMII,
@@ -231,7 +231,7 @@ enum cvmx_helper_interface_mode { 
	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 enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int

static inline cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int

								   interface)

{

	return 0;