Skip to content

Commit

Permalink
davinci: edma: use BIT() wherever possible
Browse files Browse the repository at this point in the history 
This patch replaces occurences of (1 << x) with
BIT(x) as it makes for much better reading.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
  • Loading branch information
Sekhar Nori authored and Kevin Hilman committed May 13, 2010
1 parent 243bc65 commit d78a949
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions arch/arm/mach-davinci/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,16 +312,16 @@ setup_dma_interrupt(unsigned lch,

if (!callback)
edma_shadow0_write_array(ctlr, SH_IECR, lch >> 5,
(1 << (lch & 0x1f)));
BIT(lch & 0x1f));

edma_cc[ctlr]->intr_data[lch].callback = callback;
edma_cc[ctlr]->intr_data[lch].data = data;

if (callback) {
edma_shadow0_write_array(ctlr, SH_ICR, lch >> 5,
(1 << (lch & 0x1f)));
BIT(lch & 0x1f));
edma_shadow0_write_array(ctlr, SH_IESR, lch >> 5,
(1 << (lch & 0x1f)));
BIT(lch & 0x1f));
}
}

Expand Down Expand Up @@ -374,7 +374,7 @@ static irqreturn_t dma_irq_handler(int irq, void *data)
SH_IER, j) & BIT(i))) {
/* Clear the corresponding IPR bits */
edma_shadow0_write_array(ctlr, SH_ICR, j,
(1 << i));
BIT(i));
if (edma_cc[ctlr]->intr_data[k].callback)
edma_cc[ctlr]->intr_data[k].callback(
k, DMA_COMPLETE,
Expand Down Expand Up @@ -423,13 +423,13 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
for (i = 0; i < 32; i++) {
int k = (j << 5) + i;
if (edma_read_array(ctlr, EDMA_EMR, j) &
(1 << i)) {
BIT(i)) {
/* Clear the corresponding EMR bits */
edma_write_array(ctlr, EDMA_EMCR, j,
1 << i);
BIT(i));
/* Clear any SER */
edma_shadow0_write_array(ctlr, SH_SECR,
j, (1 << i));
j, BIT(i));
if (edma_cc[ctlr]->intr_data[k].
callback) {
edma_cc[ctlr]->intr_data[k].
Expand All @@ -444,11 +444,11 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
dev_dbg(data, "QEMR %02x\n",
edma_read(ctlr, EDMA_QEMR));
for (i = 0; i < 8; i++) {
if (edma_read(ctlr, EDMA_QEMR) & (1 << i)) {
if (edma_read(ctlr, EDMA_QEMR) & BIT(i)) {
/* Clear the corresponding IPR bits */
edma_write(ctlr, EDMA_QEMCR, 1 << i);
edma_write(ctlr, EDMA_QEMCR, BIT(i));
edma_shadow0_write(ctlr, SH_QSECR,
(1 << i));
BIT(i));

/* NOTE: not reported!! */
}
Expand All @@ -460,9 +460,9 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
* to just write CCERRCLR with CCERR value...
*/
for (i = 0; i < 8; i++) {
if (edma_read(ctlr, EDMA_CCERR) & (1 << i)) {
if (edma_read(ctlr, EDMA_CCERR) & BIT(i)) {
/* Clear the corresponding IPR bits */
edma_write(ctlr, EDMA_CCERRCLR, 1 << i);
edma_write(ctlr, EDMA_CCERRCLR, BIT(i));

/* NOTE: not reported!! */
}
Expand Down Expand Up @@ -666,7 +666,7 @@ int edma_alloc_channel(int channel,
}

/* ensure access through shadow region 0 */
edma_or_array2(ctlr, EDMA_DRAE, 0, channel >> 5, 1 << (channel & 0x1f));
edma_or_array2(ctlr, EDMA_DRAE, 0, channel >> 5, BIT(channel & 0x1f));

/* ensure no events are pending */
edma_stop(EDMA_CTLR_CHAN(ctlr, channel));
Expand Down Expand Up @@ -1204,7 +1204,7 @@ void edma_pause(unsigned channel)
channel = EDMA_CHAN_SLOT(channel);

if (channel < edma_cc[ctlr]->num_channels) {
unsigned int mask = (1 << (channel & 0x1f));
unsigned int mask = BIT(channel & 0x1f);

edma_shadow0_write_array(ctlr, SH_EECR, channel >> 5, mask);
}
Expand All @@ -1225,7 +1225,7 @@ void edma_resume(unsigned channel)
channel = EDMA_CHAN_SLOT(channel);

if (channel < edma_cc[ctlr]->num_channels) {
unsigned int mask = (1 << (channel & 0x1f));
unsigned int mask = BIT(channel & 0x1f);

edma_shadow0_write_array(ctlr, SH_EESR, channel >> 5, mask);
}
Expand All @@ -1252,7 +1252,7 @@ int edma_start(unsigned channel)

if (channel < edma_cc[ctlr]->num_channels) {
int j = channel >> 5;
unsigned int mask = (1 << (channel & 0x1f));
unsigned int mask = BIT(channel & 0x1f);

/* EDMA channels without event association */
if (test_bit(channel, edma_cc[ctlr]->edma_unused)) {
Expand Down Expand Up @@ -1298,7 +1298,7 @@ void edma_stop(unsigned channel)

if (channel < edma_cc[ctlr]->num_channels) {
int j = channel >> 5;
unsigned int mask = (1 << (channel & 0x1f));
unsigned int mask = BIT(channel & 0x1f);

edma_shadow0_write_array(ctlr, SH_EECR, j, mask);
edma_shadow0_write_array(ctlr, SH_ECR, j, mask);
Expand Down Expand Up @@ -1337,7 +1337,7 @@ void edma_clean_channel(unsigned channel)

if (channel < edma_cc[ctlr]->num_channels) {
int j = (channel >> 5);
unsigned int mask = 1 << (channel & 0x1f);
unsigned int mask = BIT(channel & 0x1f);

pr_debug("EDMA: EMR%d %08x\n", j,
edma_read_array(ctlr, EDMA_EMR, j));
Expand All @@ -1346,7 +1346,7 @@ void edma_clean_channel(unsigned channel)
edma_write_array(ctlr, EDMA_EMCR, j, mask);
/* Clear any SER */
edma_shadow0_write_array(ctlr, SH_SECR, j, mask);
edma_write(ctlr, EDMA_CCERRCLR, (1 << 16) | 0x3);
edma_write(ctlr, EDMA_CCERRCLR, BIT(16) | BIT(1) | BIT(0));
}
}
EXPORT_SYMBOL(edma_clean_channel);
Expand All @@ -1366,9 +1366,9 @@ void edma_clear_event(unsigned channel)
if (channel >= edma_cc[ctlr]->num_channels)
return;
if (channel < 32)
edma_write(ctlr, EDMA_ECR, 1 << channel);
edma_write(ctlr, EDMA_ECR, BIT(channel));
else
edma_write(ctlr, EDMA_ECRH, 1 << (channel - 32));
edma_write(ctlr, EDMA_ECRH, BIT(channel - 32));
}
EXPORT_SYMBOL(edma_clear_event);

Expand Down

0 comments on commit d78a949

Please sign in to comment.