diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-08-08 06:38:43 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-08-24 23:58:12 -0400 |
commit | 2b63b341d42cd64ff40062447320d46cf3e7f0bb (patch) | |
tree | 535764aa418d432de9468ec7432a895b190405f1 /drivers/mmc | |
parent | 1036563e1417c050993bbd48f20a84ff7c7cef99 (diff) |
mmc: tmio-mmc: Remove .get_cd() callback from platform data
All platforms pass the CD GPIO number to the driver in the .cd_gpio
field. The .get_cd() callback isn't used anymore, remove it
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 17f7fa99376e..b3802256f954 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c | |||
@@ -936,25 +936,11 @@ static int tmio_mmc_get_ro(struct mmc_host *mmc) | |||
936 | (sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT)); | 936 | (sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT)); |
937 | } | 937 | } |
938 | 938 | ||
939 | static int tmio_mmc_get_cd(struct mmc_host *mmc) | ||
940 | { | ||
941 | struct tmio_mmc_host *host = mmc_priv(mmc); | ||
942 | struct tmio_mmc_data *pdata = host->pdata; | ||
943 | int ret = mmc_gpio_get_cd(mmc); | ||
944 | if (ret >= 0) | ||
945 | return ret; | ||
946 | |||
947 | if (!pdata->get_cd) | ||
948 | return -ENOSYS; | ||
949 | else | ||
950 | return pdata->get_cd(host->pdev); | ||
951 | } | ||
952 | |||
953 | static const struct mmc_host_ops tmio_mmc_ops = { | 939 | static const struct mmc_host_ops tmio_mmc_ops = { |
954 | .request = tmio_mmc_request, | 940 | .request = tmio_mmc_request, |
955 | .set_ios = tmio_mmc_set_ios, | 941 | .set_ios = tmio_mmc_set_ios, |
956 | .get_ro = tmio_mmc_get_ro, | 942 | .get_ro = tmio_mmc_get_ro, |
957 | .get_cd = tmio_mmc_get_cd, | 943 | .get_cd = mmc_gpio_get_cd, |
958 | .enable_sdio_irq = tmio_mmc_enable_sdio_irq, | 944 | .enable_sdio_irq = tmio_mmc_enable_sdio_irq, |
959 | }; | 945 | }; |
960 | 946 | ||