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

Commit 2ee4f620 authored by Kees Cook's avatar Kees Cook Committed by Ulf Hansson
Browse files

mmc: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Bruce Chang <brucechang@via.com.tw>
Cc: Harald Welte <HaraldWelte@viatech.com>
Cc: Tony Olech <tony.olech@elandigitalsystems.com>
Cc: Pierre Ossman <pierre@ossman.eu>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Shawn Lin <shawn.lin@rock-chips.com>
Cc: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: Allen <allen.lkml@gmail.com>
Cc: linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 1c451c13

drivers/mmc/host/atmel-mci.c

+6 −7
Original line number Diff line number Diff line
@@ -732,11 +732,11 @@ static inline unsigned int atmci_convert_chksize(struct atmel_mci *host, 
		return 0;

}



static void atmci_timeout_timer(unsigned long data)

static void atmci_timeout_timer(struct timer_list *t)

{

	struct atmel_mci *host;



	host = (struct atmel_mci *)data;

	host = from_timer(host, t, timer);



	dev_dbg(&host->pdev->dev, "software timeout\n");
@@ -1661,9 +1661,9 @@ static void atmci_command_complete(struct atmel_mci *host, 
		cmd->error = 0;

}



static void atmci_detect_change(unsigned long data)

static void atmci_detect_change(struct timer_list *t)

{

	struct atmel_mci_slot	*slot = (struct atmel_mci_slot *)data;

	struct atmel_mci_slot	*slot = from_timer(slot, t, detect_timer);

	bool			present;

	bool			present_old;
@@ -2349,8 +2349,7 @@ static int atmci_init_slot(struct atmel_mci *host, 
	if (gpio_is_valid(slot->detect_pin)) {

		int ret;



		setup_timer(&slot->detect_timer, atmci_detect_change,

				(unsigned long)slot);

		timer_setup(&slot->detect_timer, atmci_detect_change, 0);



		ret = request_irq(gpio_to_irq(slot->detect_pin),

				atmci_detect_interrupt,
@@ -2563,7 +2562,7 @@ static int atmci_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, host);



	setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);

	timer_setup(&host->timer, atmci_timeout_timer, 0);



	pm_runtime_get_noresume(&pdev->dev);

	pm_runtime_set_active(&pdev->dev);

drivers/mmc/host/jz4740_mmc.c

+3 −4
Original line number Diff line number Diff line
@@ -586,9 +586,9 @@ static bool jz4740_mmc_read_data(struct jz4740_mmc_host *host, 
	return true;

}



static void jz4740_mmc_timeout(unsigned long data)

static void jz4740_mmc_timeout(struct timer_list *t)

{

	struct jz4740_mmc_host *host = (struct jz4740_mmc_host *)data;

	struct jz4740_mmc_host *host = from_timer(host, t, timeout_timer);



	if (!test_and_clear_bit(0, &host->waiting))

		return;
@@ -1036,8 +1036,7 @@ static int jz4740_mmc_probe(struct platform_device* pdev) 


	jz4740_mmc_reset(host);

	jz4740_mmc_clock_disable(host);

	setup_timer(&host->timeout_timer, jz4740_mmc_timeout,

			(unsigned long)host);

	timer_setup(&host->timeout_timer, jz4740_mmc_timeout, 0);



	host->use_dma = true;

	if (host->use_dma && jz4740_mmc_acquire_dma_channels(host) != 0)

drivers/mmc/host/meson-mx-sdio.c

+3 −4
Original line number Diff line number Diff line
@@ -474,9 +474,9 @@ static irqreturn_t meson_mx_mmc_irq_thread(int irq, void *irq_data) 
	return IRQ_HANDLED;

}



static void meson_mx_mmc_timeout(unsigned long arg)

static void meson_mx_mmc_timeout(struct timer_list *t)

{

	struct meson_mx_mmc_host *host = (void *) arg;

	struct meson_mx_mmc_host *host = from_timer(host, t, cmd_timeout);

	unsigned long irqflags;

	u32 irqc;
@@ -652,8 +652,7 @@ static int meson_mx_mmc_probe(struct platform_device *pdev) 
	host->controller_dev = &pdev->dev;



	spin_lock_init(&host->irq_lock);

	setup_timer(&host->cmd_timeout, meson_mx_mmc_timeout,

		    (unsigned long)host);

	timer_setup(&host->cmd_timeout, meson_mx_mmc_timeout, 0);



	platform_set_drvdata(pdev, host);

drivers/mmc/host/mvsdio.c

+3 −3
Original line number Diff line number Diff line
@@ -508,9 +508,9 @@ static irqreturn_t mvsd_irq(int irq, void *dev) 
	return IRQ_NONE;

}



static void mvsd_timeout_timer(unsigned long data)

static void mvsd_timeout_timer(struct timer_list *t)

{

	struct mvsd_host *host = (struct mvsd_host *)data;

	struct mvsd_host *host = from_timer(host, t, timer);

	void __iomem *iobase = host->base;

	struct mmc_request *mrq;

	unsigned long flags;
@@ -776,7 +776,7 @@ static int mvsd_probe(struct platform_device *pdev) 
		goto out;

	}



	setup_timer(&host->timer, mvsd_timeout_timer, (unsigned long)host);

	timer_setup(&host->timer, mvsd_timeout_timer, 0);

	platform_set_drvdata(pdev, mmc);

	ret = mmc_add_host(mmc);

	if (ret)

drivers/mmc/host/mxcmmc.c

+3 −4
Original line number Diff line number Diff line
@@ -963,10 +963,9 @@ static bool filter(struct dma_chan *chan, void *param) 
	return true;

}



static void mxcmci_watchdog(unsigned long data)

static void mxcmci_watchdog(struct timer_list *t)

{

	struct mmc_host *mmc = (struct mmc_host *)data;

	struct mxcmci_host *host = mmc_priv(mmc);

	struct mxcmci_host *host = from_timer(host, t, watchdog);

	struct mmc_request *req = host->req;

	unsigned int stat = mxcmci_readl(host, MMC_REG_STATUS);
@@ -1165,7 +1164,7 @@ static int mxcmci_probe(struct platform_device *pdev) 
			goto out_free_dma;

	}



	setup_timer(&host->watchdog, &mxcmci_watchdog, (unsigned long)mmc);

	timer_setup(&host->watchdog, mxcmci_watchdog, 0);



	mmc_add_host(mmc);