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

Commit 4da98670 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: remove now unneeded seperate irq handlers 



We removed installation of separate handlers previously, so we can also
remove the separate handlers.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent adcbc949

drivers/mmc/host/tmio_mmc.h

+0 −3
Original line number Diff line number Diff line
@@ -115,9 +115,6 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host); 
void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i);

void tmio_mmc_disable_mmc_irqs(struct tmio_mmc_host *host, u32 i);

irqreturn_t tmio_mmc_irq(int irq, void *devid);

irqreturn_t tmio_mmc_sdcard_irq(int irq, void *devid);

irqreturn_t tmio_mmc_card_detect_irq(int irq, void *devid);

irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid);



static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg,

					 unsigned long *flags)

drivers/mmc/host/tmio_mmc_pio.c

+2 −29
Original line number Diff line number Diff line
@@ -658,18 +658,6 @@ static bool __tmio_mmc_card_detect_irq(struct tmio_mmc_host *host, 
	return false;

}



irqreturn_t tmio_mmc_card_detect_irq(int irq, void *devid)

{

	unsigned int ireg, status;

	struct tmio_mmc_host *host = devid;



	tmio_mmc_card_irq_status(host, &ireg, &status);

	__tmio_mmc_card_detect_irq(host, ireg, status);



	return IRQ_HANDLED;

}

EXPORT_SYMBOL(tmio_mmc_card_detect_irq);



static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host,

				 int ireg, int status)

{
@@ -699,19 +687,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host, 
	return false;

}



irqreturn_t tmio_mmc_sdcard_irq(int irq, void *devid)

{

	unsigned int ireg, status;

	struct tmio_mmc_host *host = devid;



	tmio_mmc_card_irq_status(host, &ireg, &status);

	__tmio_mmc_sdcard_irq(host, ireg, status);



	return IRQ_HANDLED;

}

EXPORT_SYMBOL(tmio_mmc_sdcard_irq);



irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid)

static void tmio_mmc_sdio_irq(int irq, void *devid)

{

	struct tmio_mmc_host *host = devid;

	struct mmc_host *mmc = host->mmc;
@@ -720,7 +696,7 @@ irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid) 
	unsigned int sdio_status;



	if (!(pdata->flags & TMIO_MMC_SDIO_IRQ))

		return IRQ_HANDLED;

		return;



	status = sd_ctrl_read16(host, CTL_SDIO_STATUS);

	ireg = status & TMIO_SDIO_MASK_ALL & ~host->sdcard_irq_mask;
@@ -733,10 +709,7 @@ irqreturn_t tmio_mmc_sdio_irq(int irq, void *devid) 


	if (mmc->caps & MMC_CAP_SDIO_IRQ && ireg & TMIO_SDIO_STAT_IOIRQ)

		mmc_signal_sdio_irq(mmc);



	return IRQ_HANDLED;

}

EXPORT_SYMBOL(tmio_mmc_sdio_irq);



irqreturn_t tmio_mmc_irq(int irq, void *devid)

{