From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755694AbZCFHxE (ORCPT ); Fri, 6 Mar 2009 02:53:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752379AbZCFHv1 (ORCPT ); Fri, 6 Mar 2009 02:51:27 -0500 Received: from nwd2mail10.analog.com ([137.71.25.55]:5018 "EHLO nwd2mail10.analog.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754117AbZCFHvZ (ORCPT ); Fri, 6 Mar 2009 02:51:25 -0500 X-IronPort-AV: E=Sophos;i="4.38,313,1233550800"; d="scan'208";a="83886316" From: Bryan Wu To: broonie@opensource.wolfsonmicro.com Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Mike Frysinger , Bryan Wu Subject: [PATCH 4/5] ASoC: Blackfin: drop pointless casts due to dma updates Date: Fri, 6 Mar 2009 15:53:29 +0800 Message-Id: <1236326010-683-5-git-send-email-cooloney@kernel.org> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1236326010-683-1-git-send-email-cooloney@kernel.org> References: <1236326010-683-1-git-send-email-cooloney@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Frysinger Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- sound/blackfin/bf53x_sport.c | 55 ++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 31 deletions(-) diff --git a/sound/blackfin/bf53x_sport.c b/sound/blackfin/bf53x_sport.c index 8dfa694..23ef579 100644 --- a/sound/blackfin/bf53x_sport.c +++ b/sound/blackfin/bf53x_sport.c @@ -165,7 +165,7 @@ static void setup_desc(struct dmasg *desc, void *buf, int fragcount, int i; for (i=0; idummy_rx_desc != NULL); SPORT_ASSERT(sport->curr_rx_desc != sport->dummy_rx_desc); - sport->dummy_rx_desc->next_desc_addr = \ - (unsigned long)(sport->dummy_rx_desc+1); + sport->dummy_rx_desc->next_desc_addr = sport->dummy_rx_desc + 1; local_irq_save(flags); desc = (struct dmasg *)get_dma_next_desc_ptr(sport->dma_rx_chan); @@ -226,12 +225,12 @@ static inline int sport_hook_rx_dummy(struct bf53x_sport *sport) temp_desc = *desc; desc->x_count=0x10; desc->y_count=0; - desc->next_desc_addr = (unsigned long)(sport->dummy_rx_desc); + desc->next_desc_addr = sport->dummy_rx_desc; local_irq_restore(flags); /* Waiting for dummy buffer descriptor is already hooked*/ while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) - \ - sizeof(struct dmasg)) != \ - (unsigned long)sport->dummy_rx_desc) {} + sizeof(struct dmasg)) != sport->dummy_rx_desc) + continue; sport->curr_rx_desc = sport->dummy_rx_desc; /* Restore the damaged descriptor */ *desc = temp_desc; @@ -244,13 +243,12 @@ static inline int sport_rx_dma_start(struct bf53x_sport *sport, int dummy) struct dma_register *dma = sport->dma_rx; if (dummy) { - sport->dummy_rx_desc->next_desc_addr = \ - (unsigned long) sport->dummy_rx_desc; + sport->dummy_rx_desc->next_desc_addr = sport->dummy_rx_desc; sport->curr_rx_desc = sport->dummy_rx_desc; } else sport->curr_rx_desc = sport->dma_rx_desc; - dma->next_desc_ptr = (unsigned long)(sport->curr_rx_desc); + dma->next_desc_ptr = sport->curr_rx_desc; dma->cfg = DMAFLOW_LARGE | NDSIZE_9 | WDSIZE_32 | WNR; dma->x_count = 0; dma->x_modify = 0; @@ -267,13 +265,12 @@ static inline int sport_tx_dma_start(struct bf53x_sport *sport, int dummy) struct dma_register *dma = sport->dma_tx; if (dummy) { - sport->dummy_tx_desc->next_desc_addr = \ - (unsigned long) sport->dummy_tx_desc; + sport->dummy_tx_desc->next_desc_addr = sport->dummy_tx_desc; sport->curr_tx_desc = sport->dummy_tx_desc; } else sport->curr_tx_desc = sport->dma_tx_desc; - dma->next_desc_ptr = (unsigned long)(sport->curr_tx_desc); + dma->next_desc_ptr = sport->curr_tx_desc; dma->cfg = DMAFLOW_LARGE | NDSIZE_9 | WDSIZE_32 ; dma->x_count = 0; dma->x_modify = 0; @@ -298,10 +295,9 @@ int bf53x_sport_rx_start(struct bf53x_sport *sport) SPORT_ASSERT(sport->curr_rx_desc == sport->dummy_rx_desc); local_irq_save(flags); while ((get_dma_curr_desc_ptr(sport->dma_rx_chan) - \ - sizeof(struct dmasg)) != \ - (unsigned long)sport->dummy_rx_desc) {} - sport->dummy_rx_desc->next_desc_addr = \ - (unsigned long)(sport->dma_rx_desc); + sizeof(struct dmasg)) != sport->dummy_rx_desc) + continue; + sport->dummy_rx_desc->next_desc_addr = sport->dma_rx_desc; local_irq_restore(flags); sport->curr_rx_desc = sport->dma_rx_desc; } else { @@ -343,8 +339,7 @@ static inline int sport_hook_tx_dummy(struct bf53x_sport *sport) SPORT_ASSERT(sport->dummy_tx_desc != NULL); SPORT_ASSERT(sport->curr_tx_desc != sport->dummy_tx_desc); - sport->dummy_tx_desc->next_desc_addr = \ - (unsigned long)(sport->dummy_tx_desc+1); + sport->dummy_tx_desc->next_desc_addr = sport->dummy_tx_desc + 1; /* Shorten the time on last normal descriptor */ local_irq_save(flags); @@ -353,12 +348,12 @@ static inline int sport_hook_tx_dummy(struct bf53x_sport *sport) temp_desc = *desc; desc->x_count = 0x10; desc->y_count = 0; - desc->next_desc_addr = (unsigned long)(sport->dummy_tx_desc); + desc->next_desc_addr = sport->dummy_tx_desc; local_irq_restore(flags); /* Waiting for dummy buffer descriptor is already hooked*/ while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) - \ - sizeof(struct dmasg)) != \ - (unsigned long)sport->dummy_tx_desc) {} + sizeof(struct dmasg)) != sport->dummy_tx_desc) + continue; sport->curr_tx_desc = sport->dummy_tx_desc; /* Restore the damaged descriptor */ *desc = temp_desc; @@ -381,10 +376,9 @@ int bf53x_sport_tx_start(struct bf53x_sport *sport) /* Hook the normal buffer descriptor */ local_irq_save(flags); while ((get_dma_curr_desc_ptr(sport->dma_tx_chan) - \ - sizeof(struct dmasg)) != \ - (unsigned long)sport->dummy_tx_desc) {} - sport->dummy_tx_desc->next_desc_addr = \ - (unsigned long)(sport->dma_tx_desc); + sizeof(struct dmasg)) != sport->dummy_tx_desc) + continue; + sport->dummy_tx_desc->next_desc_addr = sport->dma_tx_desc; local_irq_restore(flags); sport->curr_tx_desc = sport->dma_tx_desc; } else { @@ -587,8 +581,8 @@ static int sport_config_rx_dummy(struct bf53x_sport *sport, size_t size) desc->y_count = 0; desc->y_modify = 0; memcpy(desc+1, desc, sizeof(*desc)); - desc->next_desc_addr = (unsigned long)(desc+1); - desc[1].next_desc_addr = (unsigned long)desc; + desc->next_desc_addr = desc + 1; + desc[1].next_desc_addr = desc; return 0; } @@ -623,8 +617,8 @@ static int sport_config_tx_dummy(struct bf53x_sport *sport, size_t size) desc->y_count = 0; desc->y_modify = 0; memcpy(desc+1, desc, sizeof(*desc)); - desc->next_desc_addr = (unsigned long)(desc+1); - desc[1].next_desc_addr = (unsigned long)desc; + desc->next_desc_addr = desc + 1; + desc[1].next_desc_addr = desc; return 0; } @@ -918,6 +912,5 @@ void bf53x_sport_done(struct bf53x_sport *sport) free_dma(sport->dma_tx_chan); free_irq(sport->err_irq, sport); - kfree(sport); } -- 1.5.6.3