aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/platform_data
diff options
context:
space:
mode:
authorAndreas Fenkart <afenkart@gmail.com>2014-11-08 09:33:17 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2014-11-26 08:30:56 -0500
commit80412ca8abf087354891108d2f888ad3de56e73c (patch)
tree718cc12ad96919af4c4e18fa94cdeddf3547275d /include/linux/platform_data
parentb5cd43f062717b6c92f93bc0c593764e144ea331 (diff)
mmc: omap_hsmmc: remove unused slot_id parameter
omap_hsmmc only supports one slot. So slot id is always zero, and slot id was never used in the callbacks anyway Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Andreas Fenkart <afenkart@gmail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'include/linux/platform_data')
-rw-r--r--include/linux/platform_data/hsmmc-omap.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h
index 68ffec14b56a..67bbcf0785f6 100644
--- a/include/linux/platform_data/hsmmc-omap.h
+++ b/include/linux/platform_data/hsmmc-omap.h
@@ -38,9 +38,6 @@ struct omap_hsmmc_platform_data {
38 /* back-link to device */ 38 /* back-link to device */
39 struct device *dev; 39 struct device *dev;
40 40
41 /* number of slots per controller */
42 unsigned nr_slots:2;
43
44 /* set if your board has components or wiring that limits the 41 /* set if your board has components or wiring that limits the
45 * maximum frequency on the MMC bus */ 42 * maximum frequency on the MMC bus */
46 unsigned int max_freq; 43 unsigned int max_freq;
@@ -79,15 +76,12 @@ struct omap_hsmmc_platform_data {
79 int switch_pin; /* gpio (card detect) */ 76 int switch_pin; /* gpio (card detect) */
80 int gpio_wp; /* gpio (write protect) */ 77 int gpio_wp; /* gpio (write protect) */
81 78
82 int (*set_power)(struct device *dev, int slot, 79 int (*set_power)(struct device *dev, int power_on, int vdd);
83 int power_on, int vdd); 80 void (*remux)(struct device *dev, int power_on);
84 void (*remux)(struct device *dev, int slot, int power_on);
85 /* Call back before enabling / disabling regulators */ 81 /* Call back before enabling / disabling regulators */
86 void (*before_set_reg)(struct device *dev, int slot, 82 void (*before_set_reg)(struct device *dev, int power_on, int vdd);
87 int power_on, int vdd);
88 /* Call back after enabling / disabling regulators */ 83 /* Call back after enabling / disabling regulators */
89 void (*after_set_reg)(struct device *dev, int slot, 84 void (*after_set_reg)(struct device *dev, int power_on, int vdd);
90 int power_on, int vdd);
91 /* if we have special card, init it using this callback */ 85 /* if we have special card, init it using this callback */
92 void (*init_card)(struct mmc_card *card); 86 void (*init_card)(struct mmc_card *card);
93 87