lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: et131x: fold up simple wrapper functions

Browse Source 
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox
2009-10-06 15:49:13 +01:00
committed by Greg Kroah-Hartman
parent 7f59b1bfa3
commit f432c55e14
1 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/staging/et131x/et1310_rx.c
View File

@@ -417,14 +417,16 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
MP_RFD, list_node); MP_RFD, list_node);
list_del(&rfd->list_node); list_del(&rfd->list_node);
et131x_rfd_resources_free(adapter, rfd); rfd->Packet = NULL;
kmem_cache_free(adapter->RxRing.RecvLookaside, rfd);
} }
while (!list_empty(&rx_ring->RecvPendingList)) { while (!list_empty(&rx_ring->RecvPendingList)) {
rfd = (MP_RFD *) list_entry(rx_ring->RecvPendingList.next, rfd = (MP_RFD *) list_entry(rx_ring->RecvPendingList.next,
MP_RFD, list_node); MP_RFD, list_node);
list_del(&rfd->list_node); list_del(&rfd->list_node);
et131x_rfd_resources_free(adapter, rfd); rfd->Packet = NULL;
kmem_cache_free(adapter->RxRing.RecvLookaside, rfd);
} }
/* Free Free Buffer Ring 1 */ /* Free Free Buffer Ring 1 */
@@ -572,13 +574,7 @@ int et131x_init_recv(struct et131x_adapter *adapter)
continue; continue;
} }
status = et131x_rfd_resources_alloc(adapter, rfd); rfd->Packet = NULL;
if (status != 0) {
dev_err(&adapter->pdev->dev,
"Couldn't alloc packet for RFD\n");
kmem_cache_free(rx_ring->RecvLookaside, rfd);
continue;
}
/* Add this RFD to the RecvList */ /* Add this RFD to the RecvList */
list_add_tail(&rfd->list_node, &rx_ring->RecvList); list_add_tail(&rfd->list_node, &rx_ring->RecvList);
@@ -601,31 +597,6 @@ int et131x_init_recv(struct et131x_adapter *adapter)
return status; return status;
} }
/**
* et131x_rfd_resources_alloc
* @adapter: pointer to our private adapter structure
* @rfd: pointer to a RFD
*
* Returns 0 on success and errno on failure (as defined in errno.h)
*/
int et131x_rfd_resources_alloc(struct et131x_adapter *adapter, MP_RFD *rfd)
{
rfd->Packet = NULL;
return 0;
}
/**
* et131x_rfd_resources_free - Free the packet allocated for the given RFD
* @adapter: pointer to our private adapter structure
* @rfd: pointer to a RFD
*/
void et131x_rfd_resources_free(struct et131x_adapter *adapter, MP_RFD *rfd)
{
rfd->Packet = NULL;
kmem_cache_free(adapter->RxRing.RecvLookaside, rfd);
}
/** /**
* ConfigRxDmaRegs - Start of Rx_DMA init sequence * ConfigRxDmaRegs - Start of Rx_DMA init sequence
* @etdev: pointer to our adapter structure * @etdev: pointer to our adapter structure