| From 050cf2aa2edbbc361eba5e8a403b333794091eab Mon Sep 17 00:00:00 2001 |
| From: Ulf Hansson <ulf.hansson@linaro.org> |
| Date: Tue, 10 Jan 2017 16:10:52 +0100 |
| Subject: [PATCH 153/255] mmc: tmio: Remove redundant check of mmc->slot.cd_irq |
| |
| To validate whether native hotplug needs to be used, the tmio driver checks |
| whether the mmc->slot.cd_irq has been successfully assigned. |
| |
| This check is redundant at its current place in tmio_mmc_host_probe(), as |
| the mmc core assigns mmc->slot.cd_irq a valid value first when |
| mmc_gpiod_request_cd_irq() is called. Therefore, let's just remove the |
| check for now, as that also removes a layering violation of the tmio driver |
| accessing core specific data via ->slot.cd_irq. |
| |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| (cherry picked from commit efd7be7bfc8eb8942ba3dc319f323cfd0eda99e2) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -1175,8 +1175,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_ |
| |
| _host->native_hotplug = !(pdata->flags & TMIO_MMC_USE_GPIO_CD || |
| mmc->caps & MMC_CAP_NEEDS_POLL || |
| - !mmc_card_is_removable(mmc) || |
| - mmc->slot.cd_irq >= 0); |
| + !mmc_card_is_removable(mmc)); |
| |
| /* |
| * On Gen2+, eMMC with NONREMOVABLE currently fails because native |
