net: dc2114x: Clean up send_setup_frame()

Clean up the send_setup_frame() to bring it up to standards with
U-Boot coding style, invert the loops where applicable to cut
down the level of indent. No functional change.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Marek Vasut 2020-04-19 03:10:50 +02:00 committed by marex
parent 5b4e7dfb87
commit 5a0c332a8a

View File

@ -396,48 +396,48 @@ static void dc21x4x_halt(struct eth_device *dev)
pci_write_config_byte(devbusfn, PCI_CFDA_PSM, SLEEP); pci_write_config_byte(devbusfn, PCI_CFDA_PSM, SLEEP);
} }
static void send_setup_frame(struct eth_device* dev, bd_t *bis) static void send_setup_frame(struct eth_device *dev, bd_t *bis)
{ {
int i; char setup_frame[SETUP_FRAME_LEN];
char setup_frame[SETUP_FRAME_LEN]; char *pa = &setup_frame[0];
char *pa = &setup_frame[0]; int i;
memset(pa, 0xff, SETUP_FRAME_LEN); memset(pa, 0xff, SETUP_FRAME_LEN);
for (i = 0; i < ETH_ALEN; i++) { for (i = 0; i < ETH_ALEN; i++) {
*(pa + (i & 1)) = dev->enetaddr[i]; *(pa + (i & 1)) = dev->enetaddr[i];
if (i & 0x01) { if (i & 0x01)
pa += 4; pa += 4;
}
} }
for(i = 0; tx_ring[tx_new].status & cpu_to_le32(T_OWN); i++) { for (i = 0; tx_ring[tx_new].status & cpu_to_le32(T_OWN); i++) {
if (i >= TOUT_LOOP) { if (i < TOUT_LOOP)
printf("%s: tx error buffer not ready\n", dev->name); continue;
goto Done;
} printf("%s: tx error buffer not ready\n", dev->name);
return;
} }
tx_ring[tx_new].buf = cpu_to_le32(phys_to_bus((u32) &setup_frame[0])); tx_ring[tx_new].buf = cpu_to_le32(phys_to_bus((u32)&setup_frame[0]));
tx_ring[tx_new].des1 = cpu_to_le32(TD_TER | TD_SET| SETUP_FRAME_LEN); tx_ring[tx_new].des1 = cpu_to_le32(TD_TER | TD_SET | SETUP_FRAME_LEN);
tx_ring[tx_new].status = cpu_to_le32(T_OWN); tx_ring[tx_new].status = cpu_to_le32(T_OWN);
OUTL(dev, POLL_DEMAND, DE4X5_TPD); OUTL(dev, POLL_DEMAND, DE4X5_TPD);
for(i = 0; tx_ring[tx_new].status & cpu_to_le32(T_OWN); i++) { for (i = 0; tx_ring[tx_new].status & cpu_to_le32(T_OWN); i++) {
if (i >= TOUT_LOOP) { if (i < TOUT_LOOP)
printf("%s: tx buffer not ready\n", dev->name); continue;
goto Done;
} printf("%s: tx buffer not ready\n", dev->name);
return;
} }
if (le32_to_cpu(tx_ring[tx_new].status) != 0x7FFFFFFF) { if (le32_to_cpu(tx_ring[tx_new].status) != 0x7FFFFFFF) {
printf("TX error status2 = 0x%08X\n", le32_to_cpu(tx_ring[tx_new].status)); printf("TX error status2 = 0x%08X\n",
le32_to_cpu(tx_ring[tx_new].status));
} }
tx_new = (tx_new+1) % NUM_TX_DESC;
Done: tx_new = (tx_new + 1) % NUM_TX_DESC;
return;
} }
/* SROM Read and write routines. */ /* SROM Read and write routines. */