mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-04 20:21:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: eepro100: Fix remaining checkpatch issues

Browse Source 
This is automated cleanup via checkpatch, no functional change.
./scripts/checkpatch.pl --show-types -f drivers/net/eepro100.c
./scripts/checkpatch.pl -f --fix --fix-inplace drivers/net/eepro100.c

This fixes all the remaining errors except a couple of comments which
are longer than 80 characters, all the volatile misuse and all the
camelcase, that needs a separate patch.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
This commit is contained in:
Marek Vasut 2020-05-23 13:45:41 +02:00
parent 614e95152d
commit b013173079
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/net/eepro100.c
View File

@ -293,7 +293,7 @@ static struct eth_device *verify_phyaddr(const char *devname,
unsigned char model; unsigned char model;
dev = eth_get_dev_by_name(devname); dev = eth_get_dev_by_name(devname);
if (dev == NULL) { if (!dev) {
printf("%s: no such device\n", devname); printf("%s: no such device\n", devname);
return NULL; return NULL;
} }
@ -322,7 +322,7 @@ static int eepro100_miiphy_read(struct mii_dev *bus, int addr, int devad,
struct eth_device *dev; struct eth_device *dev;
dev = verify_phyaddr(bus->name, addr); dev = verify_phyaddr(bus->name, addr);
if (dev == NULL) if (!dev)
return -1; return -1;
if (get_phyreg(dev, addr, reg, &value) != 0) { if (get_phyreg(dev, addr, reg, &value) != 0) {
@ -339,7 +339,7 @@ static int eepro100_miiphy_write(struct mii_dev *bus, int addr, int devad,
struct eth_device *dev; struct eth_device *dev;
dev = verify_phyaddr(bus->name, addr); dev = verify_phyaddr(bus->name, addr);
if (dev == NULL) if (!dev)
return -1; return -1;
if (set_phyreg(dev, addr, reg, value) != 0) { if (set_phyreg(dev, addr, reg, value) != 0) {
@ -392,9 +392,8 @@ int eepro100_initialize(bd_t *bis)
debug("eepro100: Intel i82559 PCI EtherExpressPro @0x%x\n", debug("eepro100: Intel i82559 PCI EtherExpressPro @0x%x\n",
iobase); iobase);
pci_write_config_dword(devno, pci_write_config_dword(devno, PCI_COMMAND,
PCI_COMMAND, PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
/* Check if I/O accesses and Bus Mastering are enabled. */ /* Check if I/O accesses and Bus Mastering are enabled. */
pci_read_config_dword(devno, PCI_COMMAND, &status); pci_read_config_dword(devno, PCI_COMMAND, &status);
@ -408,7 +407,7 @@ int eepro100_initialize(bd_t *bis)
continue; continue;
} }
dev = (struct eth_device *)malloc(sizeof *dev); dev = (struct eth_device *)malloc(sizeof(*dev));
if (!dev) { if (!dev) {
printf("eepro100: Can not allocate memory\n"); printf("eepro100: Can not allocate memory\n");
break; break;
@ -429,6 +428,7 @@ int eepro100_initialize(bd_t *bis)
/* register mii command access routines */ /* register mii command access routines */
int retval; int retval;
struct mii_dev *mdiodev = mdio_alloc(); struct mii_dev *mdiodev = mdio_alloc();
if (!mdiodev) if (!mdiodev)
return -ENOMEM; return -ENOMEM;
strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN); strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
@ -453,7 +453,6 @@ int eepro100_initialize(bd_t *bis)
return card_number; return card_number;
} }
static int eepro100_init(struct eth_device *dev, bd_t *bis) static int eepro100_init(struct eth_device *dev, bd_t *bis)
{ {
int i, status = -1; int i, status = -1;
@ -499,9 +498,10 @@ static int eepro100_init(struct eth_device *dev, bd_t *bis)
tx_next = ((tx_next + 1) % NUM_TX_DESC); tx_next = ((tx_next + 1) % NUM_TX_DESC);
cfg_cmd = (struct descriptor *)&tx_ring[tx_cur]; cfg_cmd = (struct descriptor *)&tx_ring[tx_cur];
cfg_cmd->command = cpu_to_le16 ((CONFIG_SYS_CMD_SUSPEND | CONFIG_SYS_CMD_CONFIGURE)); cfg_cmd->command = cpu_to_le16(CONFIG_SYS_CMD_SUSPEND |
CONFIG_SYS_CMD_CONFIGURE);
cfg_cmd->status = 0; cfg_cmd->status = 0;
cfg_cmd->link = cpu_to_le32 (phys_to_bus((u32)&tx_ring[tx_next])); cfg_cmd->link = cpu_to_le32(phys_to_bus((u32)&tx_ring[tx_next]));
memcpy(cfg_cmd->params, i82558_config_cmd, memcpy(cfg_cmd->params, i82558_config_cmd,
sizeof(i82558_config_cmd)); sizeof(i82558_config_cmd));
@ -534,9 +534,10 @@ static int eepro100_init(struct eth_device *dev, bd_t *bis)
tx_next = ((tx_next + 1) % NUM_TX_DESC); tx_next = ((tx_next + 1) % NUM_TX_DESC);
ias_cmd = (struct descriptor *)&tx_ring[tx_cur]; ias_cmd = (struct descriptor *)&tx_ring[tx_cur];
ias_cmd->command = cpu_to_le16 ((CONFIG_SYS_CMD_SUSPEND | CONFIG_SYS_CMD_IAS)); ias_cmd->command = cpu_to_le16(CONFIG_SYS_CMD_SUSPEND |
CONFIG_SYS_CMD_IAS);
ias_cmd->status = 0; ias_cmd->status = 0;
ias_cmd->link = cpu_to_le32 (phys_to_bus((u32)&tx_ring[tx_next])); ias_cmd->link = cpu_to_le32(phys_to_bus((u32)&tx_ring[tx_next]));
memcpy(ias_cmd->params, dev->enetaddr, 6); memcpy(ias_cmd->params, dev->enetaddr, 6);
@ -549,8 +550,9 @@ static int eepro100_init(struct eth_device *dev, bd_t *bis)
OUTL(dev, phys_to_bus((u32)&tx_ring[tx_cur]), SCBPointer); OUTL(dev, phys_to_bus((u32)&tx_ring[tx_cur]), SCBPointer);
OUTW(dev, SCB_M | CU_START, SCBCmd); OUTW(dev, SCB_M | CU_START, SCBCmd);
for (i = 0; !(le16_to_cpu(tx_ring[tx_cur].status) & CONFIG_SYS_STATUS_C); for (i = 0;
i++) { !(le16_to_cpu(tx_ring[tx_cur].status) & CONFIG_SYS_STATUS_C);
i++) {
if (i >= TOUT_LOOP) { if (i >= TOUT_LOOP) {
printf("%s: Tx error buffer not ready\n", printf("%s: Tx error buffer not ready\n",
dev->name); dev->name);
@ -607,8 +609,9 @@ static int eepro100_send(struct eth_device *dev, void *packet, int length)
OUTL(dev, phys_to_bus((u32)&tx_ring[tx_cur]), SCBPointer); OUTL(dev, phys_to_bus((u32)&tx_ring[tx_cur]), SCBPointer);
OUTW(dev, SCB_M | CU_START, SCBCmd); OUTW(dev, SCB_M | CU_START, SCBCmd);
for (i = 0; !(le16_to_cpu(tx_ring[tx_cur].status) & CONFIG_SYS_STATUS_C); for (i = 0;
i++) { !(le16_to_cpu(tx_ring[tx_cur].status) & CONFIG_SYS_STATUS_C);
i++) {
if (i >= TOUT_LOOP) { if (i >= TOUT_LOOP) {
printf("%s: Tx error buffer not ready\n", dev->name); printf("%s: Tx error buffer not ready\n", dev->name);
goto Done; goto Done;
@ -752,13 +755,13 @@ static void init_rx_ring(struct eth_device *dev)
for (i = 0; i < NUM_RX_DESC; i++) { for (i = 0; i < NUM_RX_DESC; i++) {
rx_ring[i].status = 0; rx_ring[i].status = 0;
rx_ring[i].control = rx_ring[i].control = (i == NUM_RX_DESC - 1) ?
(i == NUM_RX_DESC - 1) ? cpu_to_le16 (RFD_CONTROL_S) : 0; cpu_to_le16 (RFD_CONTROL_S) : 0;
rx_ring[i].link = rx_ring[i].link =
cpu_to_le32 (phys_to_bus cpu_to_le32(phys_to_bus((u32)&rx_ring[(i + 1) %
((u32)&rx_ring[(i + 1) % NUM_RX_DESC])); NUM_RX_DESC]));
rx_ring[i].rx_buf_addr = 0xffffffff; rx_ring[i].rx_buf_addr = 0xffffffff;
rx_ring[i].count = cpu_to_le32 (PKTSIZE_ALIGN << 16); rx_ring[i].count = cpu_to_le32(PKTSIZE_ALIGN << 16);
} }
rx_next = 0; rx_next = 0;