GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: fec_mxc: remove useless struct nbuf

Browse source 
This locally defined struct is actually only used once
and as an opaque type. Remove it for clarity.

Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Albert ARIBAUD \(3ADEV\) 2015-06-19 14:18:27 +02:00 • committed by Stefano Babic
parent 29067abfaf
commit b189584bbb
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/net/fec_mxc.c
View file

@ -67,13 +67,6 @@ DECLARE_GLOBAL_DATA_PTR;
#undef DEBUG #undef DEBUG
struct nbuf {
uint8_t data[1500]; /**< actual data */
int length; /**< actual length */
int used; /**< buffer in use or not */
uint8_t head[16]; /**< MAC header(6 + 6 + 2) + 2(aligned) */
};
#ifdef CONFIG_FEC_MXC_SWAP_PACKET #ifdef CONFIG_FEC_MXC_SWAP_PACKET
static void swap_packet(uint32_t *packet, int length) static void swap_packet(uint32_t *packet, int length)
{ {
@ -775,7 +768,6 @@ static int fec_recv(struct eth_device *dev)
struct fec_bd *rbd = &fec->rbd_base[fec->rbd_index]; struct fec_bd *rbd = &fec->rbd_base[fec->rbd_index];
unsigned long ievent; unsigned long ievent;
int frame_length, len = 0; int frame_length, len = 0;
struct nbuf *frame;
uint16_t bd_status; uint16_t bd_status;
uint32_t addr, size, end; uint32_t addr, size, end;
int i; int i;
@ -835,12 +827,11 @@ static int fec_recv(struct eth_device *dev)
/* /*
* Get buffer address and size * Get buffer address and size
*/ */
frame = (struct nbuf *)readl(&rbd->data_pointer); addr = readl(&rbd->data_pointer);
frame_length = readw(&rbd->data_length) - 4; frame_length = readw(&rbd->data_length) - 4;
/* /*
* Invalidate data cache over the buffer * Invalidate data cache over the buffer
*/ */
addr = (uint32_t)frame;
end = roundup(addr + frame_length, ARCH_DMA_MINALIGN); end = roundup(addr + frame_length, ARCH_DMA_MINALIGN);
addr &= ~(ARCH_DMA_MINALIGN - 1); addr &= ~(ARCH_DMA_MINALIGN - 1);
invalidate_dcache_range(addr, end); invalidate_dcache_range(addr, end);
@ -849,16 +840,15 @@ static int fec_recv(struct eth_device *dev)
* Fill the buffer and pass it to upper layers * Fill the buffer and pass it to upper layers
*/ */
#ifdef CONFIG_FEC_MXC_SWAP_PACKET #ifdef CONFIG_FEC_MXC_SWAP_PACKET
swap_packet((uint32_t *)frame->data, frame_length); swap_packet((uint32_t *)addr, frame_length);
#endif #endif
memcpy(buff, frame->data, frame_length); memcpy(buff, (char *)addr, frame_length);
net_process_received_packet(buff, frame_length); net_process_received_packet(buff, frame_length);
len = frame_length; len = frame_length;
} else { } else {
if (bd_status & FEC_RBD_ERR) if (bd_status & FEC_RBD_ERR)
printf("error frame: 0x%08lx 0x%08x\n", printf("error frame: 0x%08x 0x%08x\n",
(ulong)rbd->data_pointer, addr, bd_status);
bd_status);
} }
/* /*