mmc: mmc_spi: Remove platform data .get_cd() and .get_ro() callbacks

All platforms now pass the CD and RO GPIOs to the MMC SPI driver, those
callbacks are not used anymore. Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Laurent Pinchart 2013-08-08 12:38:38 +02:00 коммит произвёл Chris Ball
Родитель f0af3689e7
Коммит 62b6af5c7e
2 изменённых файлов: 2 добавлений и 31 удалений

Просмотреть файл

@ -1273,31 +1273,11 @@ static void mmc_spi_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
} }
} }
static int mmc_spi_get_ro(struct mmc_host *mmc)
{
struct mmc_spi_host *host = mmc_priv(mmc);
if (host->pdata && host->pdata->get_ro)
return !!host->pdata->get_ro(mmc->parent);
else
return mmc_gpio_get_ro(mmc);
}
static int mmc_spi_get_cd(struct mmc_host *mmc)
{
struct mmc_spi_host *host = mmc_priv(mmc);
if (host->pdata && host->pdata->get_cd)
return !!host->pdata->get_cd(mmc->parent);
else
return mmc_gpio_get_cd(mmc);
}
static const struct mmc_host_ops mmc_spi_ops = { static const struct mmc_host_ops mmc_spi_ops = {
.request = mmc_spi_request, .request = mmc_spi_request,
.set_ios = mmc_spi_set_ios, .set_ios = mmc_spi_set_ios,
.get_ro = mmc_spi_get_ro, .get_ro = mmc_gpio_get_ro,
.get_cd = mmc_spi_get_cd, .get_cd = mmc_gpio_get_cd,
}; };

Просмотреть файл

@ -26,15 +26,6 @@ struct mmc_spi_platform_data {
void *); void *);
void (*exit)(struct device *, void *); void (*exit)(struct device *, void *);
/* sense switch on sd cards */
int (*get_ro)(struct device *);
/*
* If board does not use CD interrupts, driver can optimize polling
* using this function.
*/
int (*get_cd)(struct device *);
/* /*
* Card Detect and Read Only GPIOs. To enable debouncing on the card * Card Detect and Read Only GPIOs. To enable debouncing on the card
* detect GPIO, set the cd_debounce to the debounce time in * detect GPIO, set the cd_debounce to the debounce time in