On Tue, 3 May 2011, Per Forlin wrote:

> From: Stefan Nilsson XK <[email protected]>
> 
> If there is only 1 function registered, and IRQ:s are supported and
> currently enabled, call the callback handler directly
> without checking the CCCR registers.
> 
> Signed-off-by: Stefan Nilsson XK <[email protected]>
> Signed-off-by: Per Forlin <[email protected]>

Acked-by: Nicolas Pitre <[email protected]>

> ---
>  drivers/mmc/core/sdio_irq.c |   14 ++++++++++++++
>  1 files changed, 14 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c
> index b300161..25291bf 100644
> --- a/drivers/mmc/core/sdio_irq.c
> +++ b/drivers/mmc/core/sdio_irq.c
> @@ -32,6 +32,20 @@ static int process_sdio_pending_irqs(struct mmc_card *card)
>       int i, ret, count;
>       unsigned char pending;
>  
> +     /*
> +      * If there is only 1 function registered
> +      * call irq directly without checking the CCCR registers.
> +      */
> +     if ((card->host->caps & MMC_CAP_SDIO_IRQ) &&
> +         card->host->sdio_irqs && (card->sdio_funcs == 1))
> +             for (i = 0; i < SDIO_MAX_FUNCS; i++) {
> +                     struct sdio_func *func = card->sdio_func[i];
> +                     if (func && func->irq_handler) {
> +                             func->irq_handler(func);
> +                             return 1;
> +                     }
> +             }
> +
>       ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, &pending);
>       if (ret) {
>               printk(KERN_DEBUG "%s: error %d reading SDIO_CCCR_INTx\n",
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> linaro-dev mailing list
> [email protected]
> http://lists.linaro.org/mailman/listinfo/linaro-dev
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to