summaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-10-15 12:21:02 +0200
committerChris Ball <cjb@laptop.org>2010-10-23 21:11:22 +0800
commit012994f4fa5fc7663b51fa921c85c0a352339b24 (patch)
tree0be59053c53b957d9eaff0a8a0afee0c7641e80a /include/linux/mmc
parent2dfb579c7da171f6153cd58e8fbf7dcfe684778d (diff)
mmc: sdhci_pltfm: pass more data on custom init call
The custom init call may need more data to perform its job, so we pass it a pointer to pdata, too. Also, always use the platform_id specific data even if platform_data is present. Doing that, platform_data can additionally be parsed by init() for board-specific information (via sdhci->mmc->parent). (Note: the old behaviour was that you could override the platform_id specific data with your own. However, one can still do this by using the "sdhci" id instead of "sdhci-<something>".) Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Tested-by: Eric BĂ©nard <eric@eukrea.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/sdhci-pltfm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/sdhci-pltfm.h b/include/linux/mmc/sdhci-pltfm.h
index 0239bd70241..548d59d404c 100644
--- a/include/linux/mmc/sdhci-pltfm.h
+++ b/include/linux/mmc/sdhci-pltfm.h
@@ -28,7 +28,7 @@ struct sdhci_host;
struct sdhci_pltfm_data {
struct sdhci_ops *ops;
unsigned int quirks;
- int (*init)(struct sdhci_host *host);
+ int (*init)(struct sdhci_host *host, struct sdhci_pltfm_data *pdata);
void (*exit)(struct sdhci_host *host);
};