[PATCH 04/14] mmc: bcm2835: remove bcm2835_init()
Stefan Wahren
stefan.wahren at i2se.com
Sat Jan 7 04:51:04 PST 2017
Since bcm2835_init() is called only once with soft = 0, there is
not really a need for a separate function.
Signed-off-by: Stefan Wahren <stefan.wahren at i2se.com>
---
drivers/mmc/host/bcm2835.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index 19541fb..d87116f 100644
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -1339,22 +1339,6 @@ static void bcm2835_tasklet_finish(unsigned long param)
mmc_request_done(host->mmc, mrq);
}
-static void bcm2835_init(struct bcm2835_host *host, int soft)
-{
- dev_dbg(&host->pdev->dev, "bcm2835_init(%d)\n", soft);
-
- /* Set interrupt enables */
- host->hcfg = SDHCFG_BUSY_IRPT_EN;
-
- bcm2835_reset_internal(host);
-
- if (soft) {
- /* force clock reconfiguration */
- host->clock = 0;
- bcm2835_set_ios(host->mmc, &host->mmc->ios);
- }
-}
-
int bcm2835_add_host(struct bcm2835_host *host)
{
struct mmc_host *mmc;
@@ -1426,7 +1410,10 @@ int bcm2835_add_host(struct bcm2835_host *host)
setup_timer(&host->timer, bcm2835_timeout,
(unsigned long)host);
- bcm2835_init(host, 0);
+ /* Set interrupt enables */
+ host->hcfg = SDHCFG_BUSY_IRPT_EN;
+
+ bcm2835_reset_internal(host);
ret = request_irq(host->irq, bcm2835_irq, 0 /*IRQF_SHARED*/,
mmc_hostname(mmc), host);
--
1.7.9.5
More information about the linux-rpi-kernel
mailing list