diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-25 12:55:51 +0100 |
|---|---|---|
| committer | Chris Ball <chris@printf.net> | 2014-05-22 07:26:25 -0400 |
| commit | 3560db8e247aa35bc6b287ec7ec51cd41abd512e (patch) | |
| tree | 5cad35527d353e46ef77dcdb77edb6b264e7fdc8 /include | |
| parent | 781e989cf593c71d26bdca74f5e77b3651fc060e (diff) | |
| download | linux-3560db8e247aa35bc6b287ec7ec51cd41abd512e.tar.gz linux-3560db8e247aa35bc6b287ec7ec51cd41abd512e.tar.bz2 linux-3560db8e247aa35bc6b287ec7ec51cd41abd512e.zip | |
mmc: sdhci: push card_tasklet into threaded irq handler
There's no requirement to have the card tasklet separate now that we
have a threaded interrupt handler, so kill this and move the called
code into the threaded part of the handler.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/sdhci.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index d1aa97b77dd9..f1c8e14e8751 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -164,8 +164,7 @@ struct sdhci_host { dma_addr_t adma_addr; /* Mapped ADMA descr. table */ dma_addr_t align_addr; /* Mapped bounce buffer */ - struct tasklet_struct card_tasklet; /* Tasklet structures */ - struct tasklet_struct finish_tasklet; + struct tasklet_struct finish_tasklet; /* Tasklet structures */ struct timer_list timer; /* Timer for timeouts */ |