diff options
author | Andreas Fenkart <afenkart@gmail.com> | 2014-11-08 09:33:13 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-11-26 08:30:55 -0500 |
commit | df206c313987bff595d2199f3bbf9b160e666b32 (patch) | |
tree | 32d377bfe182cf850cbbee2a88477006e4b1840f | |
parent | e5aafa27ab9ecf8918855cfe1244565138441e58 (diff) |
mmc: omap_hsmmc: remove unused get_context_loss_count callback
trigger of this callback has been removed in 0a82e06e6183
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 12 | ||||
-rw-r--r-- | include/linux/platform_data/hsmmc-omap.h | 3 |
2 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 75b75b96040f..c65efc3cf81f 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c | |||
@@ -33,17 +33,6 @@ static u16 control_devconf1_offset; | |||
33 | 33 | ||
34 | #define HSMMC_NAME_LEN 9 | 34 | #define HSMMC_NAME_LEN 9 |
35 | 35 | ||
36 | #if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) | ||
37 | |||
38 | static int hsmmc_get_context_loss(struct device *dev) | ||
39 | { | ||
40 | return omap_pm_get_dev_context_loss_count(dev); | ||
41 | } | ||
42 | |||
43 | #else | ||
44 | #define hsmmc_get_context_loss NULL | ||
45 | #endif | ||
46 | |||
47 | static void omap_hsmmc1_before_set_reg(struct device *dev, int slot, | 36 | static void omap_hsmmc1_before_set_reg(struct device *dev, int slot, |
48 | int power_on, int vdd) | 37 | int power_on, int vdd) |
49 | { | 38 | { |
@@ -265,7 +254,6 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, | |||
265 | mmc->slots[0].caps = c->caps; | 254 | mmc->slots[0].caps = c->caps; |
266 | mmc->slots[0].internal_clock = !c->ext_clock; | 255 | mmc->slots[0].internal_clock = !c->ext_clock; |
267 | mmc->reg_offset = 0; | 256 | mmc->reg_offset = 0; |
268 | mmc->get_context_loss_count = hsmmc_get_context_loss; | ||
269 | 257 | ||
270 | mmc->slots[0].switch_pin = c->gpio_cd; | 258 | mmc->slots[0].switch_pin = c->gpio_cd; |
271 | mmc->slots[0].gpio_wp = c->gpio_wp; | 259 | mmc->slots[0].gpio_wp = c->gpio_wp; |
diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h index 7e70e15154e4..35d494f7d62f 100644 --- a/include/linux/platform_data/hsmmc-omap.h +++ b/include/linux/platform_data/hsmmc-omap.h | |||
@@ -51,9 +51,6 @@ struct omap_hsmmc_platform_data { | |||
51 | int (*suspend)(struct device *dev, int slot); | 51 | int (*suspend)(struct device *dev, int slot); |
52 | int (*resume)(struct device *dev, int slot); | 52 | int (*resume)(struct device *dev, int slot); |
53 | 53 | ||
54 | /* Return context loss count due to PM states changing */ | ||
55 | int (*get_context_loss_count)(struct device *dev); | ||
56 | |||
57 | /* Integrating attributes from the omap_hwmod layer */ | 54 | /* Integrating attributes from the omap_hwmod layer */ |
58 | u8 controller_flags; | 55 | u8 controller_flags; |
59 | 56 | ||