From: Andreas Fenkart <afenkart@gmail.com>
To: linux-mmc@vger.kernel.org
Cc: linux-omap@vger.kernel.org, Tony Lindgren <tony@atomide.com>,
Balaji T K <balajitk@ti.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
pascal.huerst@gmail.com, Andreas Fenkart <afenkart@gmail.com>
Subject: [PATCH 5/6] omap_hsmmc: remove un-initialized callbacks from platform data
Date: Mon, 22 Sep 2014 13:55:10 +0200 [thread overview]
Message-ID: <1411386911-8158-6-git-send-email-afenkart@gmail.com> (raw)
In-Reply-To: <1411386911-8158-1-git-send-email-afenkart@gmail.com>
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
---
drivers/mmc/host/omap_hsmmc.c | 15 +--------------
include/linux/platform_data/hsmmc-omap.h | 8 --------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 02f3438..465c34e 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2195,18 +2195,10 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
goto err_irq;
}
- if (pdata->init != NULL) {
- if (pdata->init(&pdev->dev) != 0) {
- dev_err(mmc_dev(host->mmc),
- "Unable to configure MMC IRQs\n");
- goto err_irq;
- }
- }
-
if (omap_hsmmc_have_reg() && !mmc_slot(host).set_power) {
ret = omap_hsmmc_reg_get(host);
if (ret)
- goto err_reg;
+ goto err_irq;
host->use_reg = 1;
}
@@ -2269,9 +2261,6 @@ err_slot_name:
err_irq_cd:
if (host->use_reg)
omap_hsmmc_reg_put(host);
-err_reg:
- if (host->pdata->cleanup)
- host->pdata->cleanup(&pdev->dev);
err_irq:
if (host->tx_chan)
dma_release_channel(host->tx_chan);
@@ -2297,8 +2286,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
mmc_remove_host(host->mmc);
if (host->use_reg)
omap_hsmmc_reg_put(host);
- if (host->pdata->cleanup)
- host->pdata->cleanup(&pdev->dev);
if (host->tx_chan)
dma_release_channel(host->tx_chan);
diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h
index 28b8cff..066075c 100644
--- a/include/linux/platform_data/hsmmc-omap.h
+++ b/include/linux/platform_data/hsmmc-omap.h
@@ -45,14 +45,6 @@ struct omap_hsmmc_platform_data {
* maximum frequency on the MMC bus */
unsigned int max_freq;
- /* switch the bus to a new slot */
- int (*switch_slot)(struct device *dev, int slot);
- /* initialize board-specific MMC functionality, can be NULL if
- * not supported */
- int (*init)(struct device *dev);
- void (*cleanup)(struct device *dev);
- void (*shutdown)(struct device *dev);
-
/* To handle board related suspend/resume functionality for MMC */
int (*suspend)(struct device *dev, int slot);
int (*resume)(struct device *dev, int slot);
--
2.1.0
next prev parent reply other threads:[~2014-09-22 11:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 11:55 [PATCH 0/6] unshare and simplify omap_hsmmc platform struct Andreas Fenkart
2014-09-22 11:55 ` [PATCH 1/6] omap_hsmmc: unshare platform data struct with mmci driver Andreas Fenkart
2014-09-22 11:55 ` [PATCH 2/6] omap_hsmmc: remove unused callbacks from platform data struct Andreas Fenkart
2014-09-22 11:55 ` [PATCH 3/6] omap_hsmmc: remove unused fields in platform_data Andreas Fenkart
2014-09-22 11:55 ` [PATCH 4/6] omap_hsmmc: remove unused get_context_loss_count callback Andreas Fenkart
2014-09-22 11:55 ` Andreas Fenkart [this message]
2014-09-22 11:55 ` [PATCH 6/6] omap_hsmmc: remove un-initialized get_cover_state callback Andreas Fenkart
2014-09-23 16:22 ` [PATCH 0/6] unshare and simplify omap_hsmmc platform struct Tony Lindgren
2014-09-24 8:55 ` 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=1411386911-8158-6-git-send-email-afenkart@gmail.com \
--to=afenkart@gmail.com \
--cc=balajitk@ti.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