Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1567810
| From | Gerd Hoffmann <kraxel@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 04/13] mmc: bcm2835: add bcm2835_check_data_error |
| Date | 2017-01-27 00:40 +0100 |
| Message-ID | <t41O1-5cG-9@gated-at.bofh.it> (permalink) |
| References | <t41O1-5cG-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Factor out common code.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/mmc/host/bcm2835.c | 30 ++++++++++++------------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index 6f9fb12..d25b85a 100644
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -951,6 +951,16 @@ static void bcm2835_timeout(unsigned long data)
spin_unlock_irqrestore(&host->lock, flags);
}
+static void bcm2835_check_data_error(struct bcm2835_host *host, u32 intmask)
+{
+ if (!host->data)
+ return;
+ if (intmask & (SDHSTS_CRC16_ERROR | SDHSTS_FIFO_ERROR))
+ host->data->error = -EILSEQ;
+ if (intmask & SDHSTS_REW_TIME_OUT)
+ host->data->error = -ETIMEDOUT;
+}
+
static void bcm2835_busy_irq(struct bcm2835_host *host, u32 intmask)
{
struct device *dev = &host->pdev->dev;
@@ -1007,15 +1017,7 @@ static void bcm2835_data_irq(struct bcm2835_host *host, u32 intmask)
if (!host->data)
return;
- if (intmask & (SDHSTS_CRC16_ERROR |
- SDHSTS_FIFO_ERROR |
- SDHSTS_REW_TIME_OUT)) {
- if (intmask & (SDHSTS_CRC16_ERROR |
- SDHSTS_FIFO_ERROR))
- host->data->error = -EILSEQ;
- else
- host->data->error = -ETIMEDOUT;
- }
+ bcm2835_check_data_error(host, intmask);
if (host->data->error) {
bcm2835_finish_data(host);
@@ -1043,15 +1045,7 @@ static void bcm2835_block_irq(struct bcm2835_host *host, u32 intmask)
return;
}
- if (intmask & (SDHSTS_CRC16_ERROR |
- SDHSTS_FIFO_ERROR |
- SDHSTS_REW_TIME_OUT)) {
- if (intmask & (SDHSTS_CRC16_ERROR |
- SDHSTS_FIFO_ERROR))
- host->data->error = -EILSEQ;
- else
- host->data->error = -ETIMEDOUT;
- }
+ bcm2835_check_data_error(host, intmask);
if (!host->dma_desc) {
WARN_ON(!host->blocks);
--
1.8.3.1
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH 04/13] mmc: bcm2835: add bcm2835_check_data_error Gerd Hoffmann <kraxel@redhat.com> - 2017-01-27 00:40 +0100
Re: [PATCH 04/13] mmc: bcm2835: add bcm2835_check_data_error Shawn Lin <shawn.lin@rock-chips.com> - 2017-01-27 03:10 +0100
Re: [PATCH 04/13] mmc: bcm2835: add bcm2835_check_data_error Gerd Hoffmann <kraxel@redhat.com> - 2017-01-27 11:40 +0100
csiph-web