| Message ID | 16502040-3beb-a3cc-b28d-28184fba0f10@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: meson-gx: remove meson_mmc_get_cd | expand |
On Sun, 12 Feb 2023 at 22:54, Heiner Kallweit <hkallweit1@gmail.com> wrote: > > 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: Heiner Kallweit <hkallweit1@gmail.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/meson-gx-mmc.c | 16 +--------------- > 1 file changed, 1 insertion(+), 15 deletions(-) > > diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c > index 6d5caf233..1d761f33d 100644 > --- a/drivers/mmc/host/meson-gx-mmc.c > +++ b/drivers/mmc/host/meson-gx-mmc.c > @@ -1064,20 +1064,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; > @@ -1146,7 +1132,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, > -- > 2.39.1 >
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 6d5caf233..1d761f33d 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -1064,20 +1064,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; @@ -1146,7 +1132,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,
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: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/mmc/host/meson-gx-mmc.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)