diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2010-10-15 12:21:02 +0200 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-10-15 21:22:12 -0400 |
| commit | 50d4f7dac5ca29706ebed33f25a2975b38409fa9 (patch) | |
| tree | 3190dc675f6b525e6cfeaf7c7bb1b8dd35367428 /include | |
| parent | 315275e8eb8b9a31e0bd77207b56ec74cfd2f0a0 (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>
(cherry picked from commit def90e68b132d2efa7228b2adbc62ab9fd5b8dbf)
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/sdhci-pltfm.h | 2 |
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); }; |