From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludovic.desroches@atmel.com (Ludovic Desroches) Date: Wed, 19 Jun 2013 14:50:46 +0200 Subject: [PATCH 3/8] mmc: atmel-mci: prepare clk before calling enable In-Reply-To: <1371640590-9585-1-git-send-email-b.brezillon@overkiz.com> References: <1371640263-9268-1-git-send-email-b.brezillon@overkiz.com> <1371640590-9585-1-git-send-email-b.brezillon@overkiz.com> Message-ID: <20130619125046.GG29205@ludovic.desroches@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Boris, Thanks for your patch. On Wed, Jun 19, 2013 at 01:16:30PM +0200, Boris BREZILLON wrote: > Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to > avoid common clk framework warnings. > > Signed-off-by: Boris BREZILLON Acked-by: Ludovic Desroches One comment below > --- > drivers/mmc/host/atmel-mci.c | 29 ++++++++++++++++++++--------- > 1 file changed, 20 insertions(+), 9 deletions(-) > > diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c > index e75774f..e3058a5 100644 > --- a/drivers/mmc/host/atmel-mci.c > +++ b/drivers/mmc/host/atmel-mci.c > @@ -380,6 +380,8 @@ static int atmci_regs_show(struct seq_file *s, void *v) > { > struct atmel_mci *host = s->private; > u32 *buf; > + int ret = 0; > + > > buf = kmalloc(ATMCI_REGS_SIZE, GFP_KERNEL); > if (!buf) > @@ -391,9 +393,13 @@ static int atmci_regs_show(struct seq_file *s, void *v) > * consistent. > */ > spin_lock_bh(&host->lock); > - clk_enable(host->mck); > + ret = clk_prepare_enable(host->mck); > + if (ret) { > + spin_unlock_bh(&host->lock); > + goto out; > + } > memcpy_fromio(buf, host->regs, ATMCI_REGS_SIZE); > - clk_disable(host->mck); > + clk_disable_unprepare(host->mck); > spin_unlock_bh(&host->lock); > > seq_printf(s, "MR:\t0x%08x%s%s ", > @@ -444,9 +450,10 @@ static int atmci_regs_show(struct seq_file *s, void *v) > val & ATMCI_CFG_LSYNC ? " LSYNC" : ""); > } > > +out: > kfree(buf); > > - return 0; > + return ret; > } > > static int atmci_regs_open(struct inode *inode, struct file *file) > @@ -1281,7 +1288,7 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > > spin_lock_bh(&host->lock); > if (!host->mode_reg) { > - clk_enable(host->mck); > + clk_prepare_enable(host->mck); > atmci_writel(host, ATMCI_CR, ATMCI_CR_SWRST); > atmci_writel(host, ATMCI_CR, ATMCI_CR_MCIEN); > if (host->caps.has_cfg_reg) > @@ -1361,7 +1368,7 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > atmci_writel(host, ATMCI_CR, ATMCI_CR_MCIDIS); > if (host->mode_reg) { > atmci_readl(host, ATMCI_MR); > - clk_disable(host->mck); > + clk_disable_unprepare(host->mck); > } > host->mode_reg = 0; > } > @@ -2379,10 +2386,12 @@ static int __init atmci_probe(struct platform_device *pdev) > if (!host->regs) > goto err_ioremap; > > - clk_enable(host->mck); > + ret = clk_prepare_enable(host->mck); > + if (ret) > + goto err_clk_prepare_enable; > atmci_writel(host, ATMCI_CR, ATMCI_CR_SWRST); > host->bus_hz = clk_get_rate(host->mck); > - clk_disable(host->mck); > + clk_disable_unprepare(host->mck); > > host->mapbase = regs->start; > > @@ -2463,6 +2472,8 @@ err_init_slot: > dma_release_channel(host->dma.chan); > free_irq(irq, host); > err_request_irq: > + clk_unprepare(host->mck); As discussed with you this part can be removed since a clk_disable_unprepare is done earlier. > +err_clk_prepare_enable: > iounmap(host->regs); > err_ioremap: > clk_put(host->mck); > @@ -2487,11 +2498,11 @@ static int __exit atmci_remove(struct platform_device *pdev) > atmci_cleanup_slot(host->slot[i], i); > } > > - clk_enable(host->mck); > + clk_prepare_enable(host->mck); > atmci_writel(host, ATMCI_IDR, ~0UL); > atmci_writel(host, ATMCI_CR, ATMCI_CR_MCIDIS); > atmci_readl(host, ATMCI_SR); > - clk_disable(host->mck); > + clk_disable_unprepare(host->mck); > > if (host->dma.chan) > dma_release_channel(host->dma.chan); > -- > 1.7.9.5 >