* Re: [PATCH RFC] mmc: omap_hsmmc: Fix the warning
2012-07-24 8:47 [PATCH RFC] mmc: omap_hsmmc: Fix the warning Shubhrajyoti D
@ 2012-08-08 2:52 ` Chris Ball
2012-08-08 5:44 ` Shubhrajyoti
0 siblings, 1 reply; 3+ messages in thread
From: Chris Ball @ 2012-08-08 2:52 UTC (permalink / raw)
To: Shubhrajyoti D; +Cc: linux-mmc, linux-omap, Kevin Hilman
Hi,
On Tue, Jul 24 2012, Shubhrajyoti D wrote:
> The commit 9c17d08 [mmc: omap_hsmmc: ensure probe returns error upon
> resource failure] introduced the below warning.
>
> CC drivers/of/of_net.o
> drivers/mmc/host/omap_hsmmc.c: In function 'omap_hsmmc_probe':
> drivers/mmc/host/omap_hsmmc.c:1936: warning: statement with no effect
>
> Fix the same by assigning the error value to ret.
>
> Cc: Kevin Hilman <khilman@ti.com>
> Reported-by: Archit Taneja <archit@ti.com>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
> ---
> drivers/mmc/host/omap_hsmmc.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index be8631d..3a09f93 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -1933,7 +1933,7 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
> host->tx_chan = dma_request_channel(mask, omap_dma_filter_fn, &tx_req);
> if (!host->tx_chan) {
> dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req);
> - ret -ENXIO;
> + ret = -ENXIO;
> goto err_irq;
> }
I think you must be confused -- this warning isn't present in mainline, and
the line in commit 9c17d08 is already correct:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=9c17d08ca183b92c9cfab6537069914a5e0e7e81
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index a9227a7..bc28627 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1931,6 +1931,7 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
if (!res) {
dev_err(mmc_dev(host->mmc), "cannot get DMA TX channel\n");
+ ret = -ENXIO;
goto err_irq;
}
host->dma_line_tx = res->start;
@@ -1938,6 +1939,7 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
if (!res) {
dev_err(mmc_dev(host->mmc), "cannot get DMA RX channel\n");
+ ret = -ENXIO;
goto err_irq;
}
host->dma_line_rx = res->start;
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply related [flat|nested] 3+ messages in thread