Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 74605
b: refs/heads/master
c: d8c0500
h: refs/heads/master
i:
  74603: 6ae4967
v: v3
  • Loading branch information
Bryan Wu authored and Linus Torvalds committed Dec 5, 2007
1 parent 6a5c5ca commit 337a32b
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07612e5f224613020c0ba17ce28e8eac052ef8ce
refs/heads/master: d8c05008b0e464c94967ed2f20d1d661fca6790e
78 changes: 39 additions & 39 deletions trunk/drivers/spi/spi_bfin5xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ static int flush(struct driver_data *drv_data)

/* wait for stop and clear stat */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF) && limit--)
continue;
cpu_relax();

write_STAT(drv_data, BIT_STAT_CLR);

Expand Down Expand Up @@ -262,7 +262,7 @@ static void null_writer(struct driver_data *drv_data)
while (drv_data->tx < drv_data->tx_end) {
write_TDBR(drv_data, 0);
while ((read_STAT(drv_data) & BIT_STAT_TXS))
continue;
cpu_relax();
drv_data->tx += n_bytes;
}
}
Expand All @@ -274,7 +274,7 @@ static void null_reader(struct driver_data *drv_data)

while (drv_data->rx < drv_data->rx_end) {
while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
dummy_read(drv_data);
drv_data->rx += n_bytes;
}
Expand All @@ -287,12 +287,12 @@ static void u8_writer(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

while (drv_data->tx < drv_data->tx_end) {
write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
while (read_STAT(drv_data) & BIT_STAT_TXS)
continue;
cpu_relax();
++drv_data->tx;
}
}
Expand All @@ -303,14 +303,14 @@ static void u8_cs_chg_writer(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

while (drv_data->tx < drv_data->tx_end) {
cs_active(drv_data, chip);

write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
while (read_STAT(drv_data) & BIT_STAT_TXS)
continue;
cpu_relax();

cs_deactive(drv_data, chip);

Expand All @@ -325,7 +325,7 @@ static void u8_reader(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

/* clear TDBR buffer before read(else it will be shifted out) */
write_TDBR(drv_data, 0xFFFF);
Expand All @@ -334,13 +334,13 @@ static void u8_reader(struct driver_data *drv_data)

while (drv_data->rx < drv_data->rx_end - 1) {
while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u8 *) (drv_data->rx) = read_RDBR(drv_data);
++drv_data->rx;
}

while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u8 *) (drv_data->rx) = read_SHAW(drv_data);
++drv_data->rx;
}
Expand All @@ -351,7 +351,7 @@ static void u8_cs_chg_reader(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

/* clear TDBR buffer before read(else it will be shifted out) */
write_TDBR(drv_data, 0xFFFF);
Expand All @@ -363,15 +363,15 @@ static void u8_cs_chg_reader(struct driver_data *drv_data)
cs_deactive(drv_data, chip);

while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
cs_active(drv_data, chip);
*(u8 *) (drv_data->rx) = read_RDBR(drv_data);
++drv_data->rx;
}
cs_deactive(drv_data, chip);

while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u8 *) (drv_data->rx) = read_SHAW(drv_data);
++drv_data->rx;
}
Expand All @@ -380,15 +380,15 @@ static void u8_duplex(struct driver_data *drv_data)
{
/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

/* in duplex mode, clk is triggered by writing of TDBR */
while (drv_data->rx < drv_data->rx_end) {
write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
while (read_STAT(drv_data) & BIT_STAT_TXS)
continue;
cpu_relax();
while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u8 *) (drv_data->rx) = read_RDBR(drv_data);
++drv_data->rx;
++drv_data->tx;
Expand All @@ -401,16 +401,16 @@ static void u8_cs_chg_duplex(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

while (drv_data->rx < drv_data->rx_end) {
cs_active(drv_data, chip);

write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
while (read_STAT(drv_data) & BIT_STAT_TXS)
continue;
cpu_relax();
while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u8 *) (drv_data->rx) = read_RDBR(drv_data);

cs_deactive(drv_data, chip);
Expand All @@ -427,12 +427,12 @@ static void u16_writer(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

while (drv_data->tx < drv_data->tx_end) {
write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
while ((read_STAT(drv_data) & BIT_STAT_TXS))
continue;
cpu_relax();
drv_data->tx += 2;
}
}
Expand All @@ -443,14 +443,14 @@ static void u16_cs_chg_writer(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

while (drv_data->tx < drv_data->tx_end) {
cs_active(drv_data, chip);

write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
while ((read_STAT(drv_data) & BIT_STAT_TXS))
continue;
cpu_relax();

cs_deactive(drv_data, chip);

Expand All @@ -465,7 +465,7 @@ static void u16_reader(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

/* clear TDBR buffer before read(else it will be shifted out) */
write_TDBR(drv_data, 0xFFFF);
Expand All @@ -474,13 +474,13 @@ static void u16_reader(struct driver_data *drv_data)

while (drv_data->rx < (drv_data->rx_end - 2)) {
while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u16 *) (drv_data->rx) = read_RDBR(drv_data);
drv_data->rx += 2;
}

while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u16 *) (drv_data->rx) = read_SHAW(drv_data);
drv_data->rx += 2;
}
Expand All @@ -491,7 +491,7 @@ static void u16_cs_chg_reader(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

/* clear TDBR buffer before read(else it will be shifted out) */
write_TDBR(drv_data, 0xFFFF);
Expand All @@ -503,15 +503,15 @@ static void u16_cs_chg_reader(struct driver_data *drv_data)
cs_deactive(drv_data, chip);

while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
cs_active(drv_data, chip);
*(u16 *) (drv_data->rx) = read_RDBR(drv_data);
drv_data->rx += 2;
}
cs_deactive(drv_data, chip);

while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u16 *) (drv_data->rx) = read_SHAW(drv_data);
drv_data->rx += 2;
}
Expand All @@ -520,15 +520,15 @@ static void u16_duplex(struct driver_data *drv_data)
{
/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

/* in duplex mode, clk is triggered by writing of TDBR */
while (drv_data->tx < drv_data->tx_end) {
write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
while (read_STAT(drv_data) & BIT_STAT_TXS)
continue;
cpu_relax();
while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u16 *) (drv_data->rx) = read_RDBR(drv_data);
drv_data->rx += 2;
drv_data->tx += 2;
Expand All @@ -541,16 +541,16 @@ static void u16_cs_chg_duplex(struct driver_data *drv_data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

while (drv_data->tx < drv_data->tx_end) {
cs_active(drv_data, chip);

write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
while (read_STAT(drv_data) & BIT_STAT_TXS)
continue;
cpu_relax();
while (!(read_STAT(drv_data) & BIT_STAT_RXS))
continue;
cpu_relax();
*(u16 *) (drv_data->rx) = read_RDBR(drv_data);

cs_deactive(drv_data, chip);
Expand Down Expand Up @@ -624,7 +624,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)

/* Wait for DMA to complete */
while (get_dma_curr_irqstat(drv_data->dma_channel) & DMA_RUN)
continue;
cpu_relax();

/*
* wait for the last transaction shifted out. HRM states:
Expand All @@ -635,11 +635,11 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
if (drv_data->tx != NULL) {
while ((read_STAT(drv_data) & TXS) ||
(read_STAT(drv_data) & TXS))
continue;
cpu_relax();
}

while (!(read_STAT(drv_data) & SPIF))
continue;
cpu_relax();

msg->actual_length += drv_data->len_in_bytes;

Expand Down Expand Up @@ -783,7 +783,7 @@ static void pump_transfers(unsigned long data)

/* poll for SPI completion before start */
while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
continue;
cpu_relax();

/* dirty hack for autobuffer DMA mode */
if (drv_data->tx_dma == 0xFFFF) {
Expand Down

0 comments on commit 337a32b

Please sign in to comment.