mmc: host: omap-hsmmc: remove init_card pdata callback from pdata

Now as we have removed the last user (pandora_wl1251_init_card)
of this callback, we can remove it from the hsmmc code.

Suggested-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index d0df054..767e964 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1510,10 +1510,7 @@ static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
 {
        struct omap_hsmmc_host *host = mmc_priv(mmc);
 
-       if (mmc_pdata(host)->init_card)
-               mmc_pdata(host)->init_card(card);
-       else if (card->type == MMC_TYPE_SDIO ||
-                card->type == MMC_TYPE_SD_COMBO) {
+       if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) {
                struct device_node *np = mmc_dev(mmc)->of_node;
 
                /*

diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h
index e79d238..7124a5f 100644 (file)
--- a/include/linux/platform_data/hsmmc-omap.h
+++ b/include/linux/platform_data/hsmmc-omap.h
@@ -67,9 +67,6 @@ struct omap_hsmmc_platform_data {
        /* string specifying a particular variant of hardware */
        char *version;
 
-       /* if we have special card, init it using this callback */
-       void (*init_card)(struct mmc_card *card);
-
        const char *name;
        u32 ocr_mask;
 };