iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit a13f7e4582.

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: Guenter Roeck <linux@roeck-us.net>
Cc: Oliver Crumrine <ozlinux@hotmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2023-10-30 09:54:14 +01:00
parent d8fecfe8f4
commit 3db9eb6dee
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/octeon/ethernet.c
View File

@ -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;

8
drivers/staging/octeon/octeon-stubs.h
View File

@ -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,8 +1265,8 @@ 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
interface)
static inline cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int
interface)
{
return 0;
}