| From 64d8f15c333fd6f609770cccce9bbc7b2e7b472a Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 8 Aug 2013 12:38:43 +0200 |
| Subject: 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> |
| (cherry picked from commit 2b63b341d42cd64ff40062447320d46cf3e7f0bb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 16 +--------------- |
| include/linux/mfd/tmio.h | 1 - |
| 2 files changed, 1 insertion(+), 16 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c |
| index 17f7fa99..b3802256 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) |
| (sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT)); |
| } |
| |
| -static int tmio_mmc_get_cd(struct mmc_host *mmc) |
| -{ |
| - struct tmio_mmc_host *host = mmc_priv(mmc); |
| - struct tmio_mmc_data *pdata = host->pdata; |
| - int ret = mmc_gpio_get_cd(mmc); |
| - if (ret >= 0) |
| - return ret; |
| - |
| - if (!pdata->get_cd) |
| - return -ENOSYS; |
| - else |
| - return pdata->get_cd(host->pdev); |
| -} |
| - |
| static const struct mmc_host_ops tmio_mmc_ops = { |
| .request = tmio_mmc_request, |
| .set_ios = tmio_mmc_set_ios, |
| .get_ro = tmio_mmc_get_ro, |
| - .get_cd = tmio_mmc_get_cd, |
| + .get_cd = mmc_gpio_get_cd, |
| .enable_sdio_irq = tmio_mmc_enable_sdio_irq, |
| }; |
| |
| diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h |
| index ce351132..b22883d6 100644 |
| --- a/include/linux/mfd/tmio.h |
| +++ b/include/linux/mfd/tmio.h |
| @@ -108,7 +108,6 @@ struct tmio_mmc_data { |
| unsigned int cd_gpio; |
| void (*set_pwr)(struct platform_device *host, int state); |
| void (*set_clk_div)(struct platform_device *host, int state); |
| - int (*get_cd)(struct platform_device *host); |
| int (*write16_hook)(struct tmio_mmc_host *host, int addr); |
| /* clock management callbacks */ |
| int (*clk_enable)(struct platform_device *pdev, unsigned int *f); |
| -- |
| 1.8.4.3.gca3854a |
| |
