From: Andreas Fenkart <afenkart@gmail.com>
To: linux-mmc@vger.kernel.org
Cc: linux-omap@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
pascal.huerst@gmail.com, Andreas Fenkart <afenkart@gmail.com>
Subject: [PATCH v2 5/9] omap_hsmmc: remove unused get_context_loss_count callback
Date: Mon, 29 Sep 2014 11:32:55 +0200 [thread overview]
Message-ID: <1411983179-28677-6-git-send-email-afenkart@gmail.com> (raw)
In-Reply-To: <1411983179-28677-1-git-send-email-afenkart@gmail.com>
trigger of this callback has been removed in 0a82e06e6183
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 1c10402..312f13d 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -32,17 +32,6 @@ static u16 control_devconf1_offset;
#define HSMMC_NAME_LEN 9
-#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
-
-static int hsmmc_get_context_loss(struct device *dev)
-{
- return omap_pm_get_dev_context_loss_count(dev);
-}
-
-#else
-#define hsmmc_get_context_loss NULL
-#endif
-
static void omap_hsmmc1_before_set_reg(struct device *dev, int slot,
int power_on, int vdd)
{
@@ -264,7 +253,6 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
mmc->slots[0].caps = c->caps;
mmc->slots[0].internal_clock = !c->ext_clock;
mmc->reg_offset = 0;
- mmc->get_context_loss_count = hsmmc_get_context_loss;
mmc->slots[0].switch_pin = c->gpio_cd;
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 2807786..dc44dfb 100644
--- a/include/linux/platform_data/hsmmc-omap.h
+++ b/include/linux/platform_data/hsmmc-omap.h
@@ -49,9 +49,6 @@ struct omap_hsmmc_platform_data {
int (*suspend)(struct device *dev, int slot);
int (*resume)(struct device *dev, int slot);
- /* Return context loss count due to PM states changing */
- int (*get_context_loss_count)(struct device *dev);
-
/* Integrating attributes from the omap_hwmod layer */
u8 controller_flags;
--
2.1.0
next prev parent reply other threads:[~2014-09-29 9:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-29 9:32 [PATCH v2 0/9] unshare and simplify omap_hsmmc platform struct Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 1/9] omap_hsmmc: use separate platform data for ompa3 and omap 1/2 driver Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 2/9] omap_hsmmc: remove unused fields in platform_data Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 3/9] omap_hsmmc: remove un-initialized callbacks from platform data Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 4/9] omap_hsmmc: remove un-ready power_saving field in omap2_hsmmc_info Andreas Fenkart
2014-09-29 9:32 ` Andreas Fenkart [this message]
2014-09-29 9:32 ` [PATCH v2 6/9] omap_hsmmc: remove unnecessary omap_hsmmc_slot_data indirection Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 7/9] omap_hsmmc: pass mmc_priv struct to gpio init / free Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 8/9] omap_hsmmc: Remove unnecessary callbacks from platform data Andreas Fenkart
2014-09-29 9:32 ` [PATCH v2 9/9] omap_hsmmc: remove unused slot_id parameter Andreas Fenkart
2014-10-02 16:42 ` Felipe Balbi
2014-10-02 16:45 ` Tony Lindgren
2014-10-02 16:51 ` Felipe Balbi
2014-10-02 16:36 ` [PATCH v2 0/9] unshare and simplify omap_hsmmc platform struct Tony Lindgren
2014-10-03 13:00 ` Ulf Hansson
2014-10-06 7:34 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411983179-28677-6-git-send-email-afenkart@gmail.com \
--to=afenkart@gmail.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=pascal.huerst@gmail.com \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox