Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a29b5fcc authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Ulf Hansson
Browse files

mmc: core: Move code to get pending SDIO IRQs to a function 



To improve code quality, let's move the code that gets pending SDIO IRQs
from process_sdio_pending_irqs() into a dedicated function.

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
[Ulf: Converted function into static]
Tested-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1c81d69d

drivers/mmc/core/sdio_irq.c

+30 −16
Original line number Diff line number Diff line
@@ -27,6 +27,34 @@ 
#include "core.h"

#include "card.h"



static int sdio_get_pending_irqs(struct mmc_host *host, u8 *pending)

{

	struct mmc_card *card = host->card;

	int ret;



	WARN_ON(!host->claimed);



	ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, pending);

	if (ret) {

		pr_debug("%s: error %d reading SDIO_CCCR_INTx\n",

		       mmc_card_id(card), ret);

		return ret;

	}



	if (*pending && mmc_card_broken_irq_polling(card) &&

	    !(host->caps & MMC_CAP_SDIO_IRQ)) {

		unsigned char dummy;



		/* A fake interrupt could be created when we poll SDIO_CCCR_INTx

		 * register with a Marvell SD8797 card. A dummy CMD52 read to

		 * function 0 register 0xff can avoid this.

		 */

		mmc_io_rw_direct(card, 0, 0, 0xff, 0, &dummy);

	}



	return 0;

}



static int process_sdio_pending_irqs(struct mmc_host *host)

{

	struct mmc_card *card = host->card;
@@ -49,23 +77,9 @@ static int process_sdio_pending_irqs(struct mmc_host *host) 
		return 1;

	}



	ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, &pending);

	if (ret) {

		pr_debug("%s: error %d reading SDIO_CCCR_INTx\n",

		       mmc_card_id(card), ret);

	ret = sdio_get_pending_irqs(host, &pending);

	if (ret)

		return ret;

	}



	if (pending && mmc_card_broken_irq_polling(card) &&

	    !(host->caps & MMC_CAP_SDIO_IRQ)) {

		unsigned char dummy;



		/* A fake interrupt could be created when we poll SDIO_CCCR_INTx

		 * register with a Marvell SD8797 card. A dummy CMD52 read to

		 * function 0 register 0xff can avoid this.

		 */

		mmc_io_rw_direct(card, 0, 0, 0xff, 0, &dummy);

	}



	count = 0;

	for (i = 1; i <= 7; i++) {