Commit 98849da6 authored by Jerome Brunet's avatar Jerome Brunet Committed by Ulf Hansson
Browse files

mmc: meson-gx: remove open coded read with timeout 



There is already a function available to poll a register until a
condition is met. Let's use it instead of open coding it.

Reviewed-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 7fc13b87

drivers/mmc/host/meson-gx-mmc.c

+4 −14
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/iopoll.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/ioport.h>
@@ -1100,7 +1101,6 @@ out: 


static int meson_mmc_wait_desc_stop(struct meson_host *host)

{

	int loop;

	u32 status;



	/*
@@ -1110,20 +1110,10 @@ static int meson_mmc_wait_desc_stop(struct meson_host *host) 
	 * If we don't confirm the descriptor is stopped, it might raise new

	 * IRQs after we have called mmc_request_done() which is bad.

	 */

	for (loop = 50; loop; loop--) {

		status = readl(host->regs + SD_EMMC_STATUS);

		if (status & (STATUS_BUSY | STATUS_DESC_BUSY))

			udelay(100);

		else

			break;

	}



	if (status & (STATUS_BUSY | STATUS_DESC_BUSY)) {

		dev_err(host->dev, "Timed out waiting for host to stop\n");

		return -ETIMEDOUT;

	}



	return 0;

	return readl_poll_timeout(host->regs + SD_EMMC_STATUS, status,

				  !(status & (STATUS_BUSY | STATUS_DESC_BUSY)),

				  100, 5000);

}



static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id)

CRA Git | Maintained and supported by SUSTech CRA and CCSE