diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /drivers/net/e1000_spi.c | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'drivers/net/e1000_spi.c')
| -rw-r--r-- | drivers/net/e1000_spi.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c index 52b3c79794a..4fcc65d9782 100644 --- a/drivers/net/e1000_spi.c +++ b/drivers/net/e1000_spi.c @@ -1,5 +1,7 @@ #include <common.h> +#include <command.h> #include <console.h> +#include <linux/delay.h> #include "e1000.h" #include <malloc.h> #include <linux/compiler.h> @@ -315,8 +317,8 @@ static int e1000_spi_eeprom_program(struct e1000_hw *hw, return 0; } -static int do_e1000_spi_show(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +static int do_e1000_spi_show(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { unsigned int length = 0; u16 i, offset = 0; @@ -384,8 +386,8 @@ static int do_e1000_spi_show(cmd_tbl_t *cmdtp, struct e1000_hw *hw, return 0; } -static int do_e1000_spi_dump(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +static int do_e1000_spi_dump(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { unsigned int length; u16 offset; @@ -429,8 +431,8 @@ static int do_e1000_spi_dump(cmd_tbl_t *cmdtp, struct e1000_hw *hw, return 0; } -static int do_e1000_spi_program(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +static int do_e1000_spi_program(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { unsigned int length; const void *source; @@ -464,8 +466,8 @@ static int do_e1000_spi_program(cmd_tbl_t *cmdtp, struct e1000_hw *hw, return 0; } -static int do_e1000_spi_checksum(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +static int do_e1000_spi_checksum(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { uint16_t i, length, checksum = 0, checksum_reg; uint16_t *buffer; @@ -540,8 +542,8 @@ static int do_e1000_spi_checksum(cmd_tbl_t *cmdtp, struct e1000_hw *hw, return 0; } -int do_e1000_spi(cmd_tbl_t *cmdtp, struct e1000_hw *hw, - int argc, char * const argv[]) +int do_e1000_spi(struct cmd_tbl *cmdtp, struct e1000_hw *hw, + int argc, char *const argv[]) { if (argc < 1) { cmd_usage(cmdtp); |