Skip to content

Commit 3db9eb6

Browse files
committed
Revert "staging: octeon: remove typedef in enum cvmx_helper_interface_mode_t"
This reverts commit a13f7e4. 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>
1 parent d8fecfe commit 3db9eb6

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/staging/octeon/ethernet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
798798

799799
num_interfaces = cvmx_helper_get_number_of_interfaces();
800800
for (interface = 0; interface < num_interfaces; interface++) {
801-
enum cvmx_helper_interface_mode imode =
801+
cvmx_helper_interface_mode_t imode =
802802
cvmx_helper_interface_get_mode(interface);
803803
int num_ports = cvmx_helper_ports_on_interface(interface);
804804
int port;

drivers/staging/octeon/octeon-stubs.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ enum cvmx_spi_mode {
220220
CVMX_SPI_MODE_DUPLEX = 3
221221
};
222222

223-
enum cvmx_helper_interface_mode {
223+
typedef enum {
224224
CVMX_HELPER_INTERFACE_MODE_DISABLED,
225225
CVMX_HELPER_INTERFACE_MODE_RGMII,
226226
CVMX_HELPER_INTERFACE_MODE_GMII,
@@ -231,7 +231,7 @@ enum cvmx_helper_interface_mode {
231231
CVMX_HELPER_INTERFACE_MODE_PICMG,
232232
CVMX_HELPER_INTERFACE_MODE_NPI,
233233
CVMX_HELPER_INTERFACE_MODE_LOOP,
234-
};
234+
} cvmx_helper_interface_mode_t;
235235

236236
typedef enum {
237237
CVMX_POW_WAIT = 1,
@@ -1265,8 +1265,8 @@ static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear,
12651265
cvmx_pko_port_status_t *status)
12661266
{ }
12671267

1268-
static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int
1269-
interface)
1268+
static inline cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int
1269+
interface)
12701270
{
12711271
return 0;
12721272
}

0 commit comments

Comments
 (0)