evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: et131x: remove unnecessary pointer typecast

Browse source 
Signed-off-by: ZHAO Gang <gamerh2o@gmail.com>
Acked-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
ZHAO Gang 2013-12-09 19:38:30 +08:00 • committed by Greg Kroah-Hartman
parent c31c135e7a
commit 57cc0279f5
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/staging/et131x/et131x.c
View file

@ -1798,7 +1798,7 @@ static void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)
} }
/* Now's the best time to initialize FBR contents */ /* Now's the best time to initialize FBR contents */
fbr_entry = (struct fbr_desc *) fbr->ring_virtaddr; fbr_entry = fbr->ring_virtaddr;
for (entry = 0; entry < fbr->num_entries; entry++) { for (entry = 0; entry < fbr->num_entries; entry++) {
fbr_entry->addr_hi = fbr->bus_high[entry]; fbr_entry->addr_hi = fbr->bus_high[entry];
fbr_entry->addr_lo = fbr->bus_low[entry]; fbr_entry->addr_lo = fbr->bus_low[entry];
@ -2290,7 +2290,7 @@ static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
WARN_ON(rx_ring->num_ready_recv != rx_ring->num_rfd); WARN_ON(rx_ring->num_ready_recv != rx_ring->num_rfd);
while (!list_empty(&rx_ring->recv_list)) { while (!list_empty(&rx_ring->recv_list)) {
rfd = (struct rfd *) list_entry(rx_ring->recv_list.next, rfd = list_entry(rx_ring->recv_list.next,
struct rfd, list_node); struct rfd, list_node);
list_del(&rfd->list_node); list_del(&rfd->list_node);
@ -2536,7 +2536,7 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
spin_lock_irqsave(&adapter->rcv_lock, flags); spin_lock_irqsave(&adapter->rcv_lock, flags);
element = rx_local->recv_list.next; element = rx_local->recv_list.next;
rfd = (struct rfd *) list_entry(element, struct rfd, list_node); rfd = list_entry(element, struct rfd, list_node);
if (!rfd) { if (!rfd) {
spin_unlock_irqrestore(&adapter->rcv_lock, flags); spin_unlock_irqrestore(&adapter->rcv_lock, flags);
@ -2713,8 +2713,7 @@ static int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)
return -ENOMEM; return -ENOMEM;
desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX); desc_size = (sizeof(struct tx_desc) * NUM_DESC_PER_RING_TX);
tx_ring->tx_desc_ring = tx_ring->tx_desc_ring = dma_alloc_coherent(&adapter->pdev->dev,
(struct tx_desc *) dma_alloc_coherent(&adapter->pdev->dev,
desc_size, desc_size,
&tx_ring->tx_desc_ring_pa, &tx_ring->tx_desc_ring_pa,
GFP_KERNEL); GFP_KERNEL);
@ -3090,9 +3089,8 @@ static inline void free_send_packet(struct et131x_adapter *adapter,
* they point to * they point to
*/ */
do { do {
desc = (struct tx_desc *) desc = adapter->tx_ring.tx_desc_ring +
(adapter->tx_ring.tx_desc_ring + INDEX10(tcb->index_start);
INDEX10(tcb->index_start));
dma_addr = desc->addr_lo; dma_addr = desc->addr_lo;
dma_addr |= (u64)desc->addr_hi << 32; dma_addr |= (u64)desc->addr_hi << 32;