The newly added spin_lock_irqsave() passes an argument of the wrong type, leading to a warning about non-portable code: drivers/mmc/host/dw_mmc.c: In function 'dw_mci_set_drto': include/linux/typecheck.h:11:18: error: comparison of distinct pointer types lacks a cast [-Werror] (void)(&__dummy == &__dummy2); \ drivers/mmc/host/dw_mmc.c:1953:2: note: in expansion of macro 'spin_lock_irqsave' spin_lock_irqsave(&host->irq_lock, irqflags); This changes the type to 'unsigned long' as it should be. Fixes: 80a2a5a7745b ("mmc: dw_mmc: Cleanup the DTO timer like the CTO one") Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> --- drivers/mmc/host/dw_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 31f5744a50e0..37b55b095daf 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1938,7 +1938,7 @@ static void dw_mci_set_drto(struct dw_mci *host) unsigned int drto_clks; unsigned int drto_div; unsigned int drto_ms; - unsigned int irqflags; + unsigned long irqflags; drto_clks = mci_readl(host, TMOUT) >> 8; drto_div = (mci_readl(host, CLKDIV) & 0xff) * 2; -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html