Commit 91a3cba7 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Ulf Hansson
Browse files

mmc: meson-gx: remove meson_mmc_get_cd 



MMC core only checks whether return value of .get_cd() equals zero.
Therefore -ENOSYS and 1 are effectively the same and the function
can be removed.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/16502040-3beb-a3cc-b28d-28184fba0f10@gmail.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 16b492ce

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

+1 −15
Original line number Diff line number Diff line
@@ -1083,20 +1083,6 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



/*

 * NOTE: we only need this until the GPIO/pinctrl driver can handle

 * interrupts.  For now, the MMC core will use this for polling.

 */

static int meson_mmc_get_cd(struct mmc_host *mmc)

{

	int status = mmc_gpio_get_cd(mmc);



	if (status == -ENOSYS)

		return 1; /* assume present */



	return status;

}



static void meson_mmc_cfg_init(struct meson_host *host)

{

	u32 cfg = 0;
@@ -1165,7 +1151,7 @@ static void meson_mmc_ack_sdio_irq(struct mmc_host *mmc) 
static const struct mmc_host_ops meson_mmc_ops = {

	.request	= meson_mmc_request,

	.set_ios	= meson_mmc_set_ios,

	.get_cd         = meson_mmc_get_cd,

	.get_cd         = mmc_gpio_get_cd,

	.pre_req	= meson_mmc_pre_req,

	.post_req	= meson_mmc_post_req,

	.execute_tuning = meson_mmc_resampling_tuning,