From: Ulf Hansson Subject: Re: [PATCH 05/13] mmc: omap_hsmmc: Support for deferred probing when requesting DMA channels Date: Thu, 28 May 2015 09:23:25 +0200 Message-ID: References: <1432646768-12532-1-git-send-email-peter.ujfalusi@ti.com> <1432646768-12532-6-git-send-email-peter.ujfalusi@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Vinod Koul , Tony Lindgren , "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Dan Williams , dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-omap , linux-mmc , linux-crypto-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org To: Peter Ujfalusi Return-path: In-Reply-To: <1432646768-12532-6-git-send-email-peter.ujfalusi-l0cyMroinI0@public.gmane.org> Sender: linux-spi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-crypto.vger.kernel.org On 26 May 2015 at 15:26, Peter Ujfalusi wrote: > Switch to use ma_request_slave_channel_compat_reason() to request the DMA I guess it should be dma_request_slave_... huh, that was a long name. :-) > channels. In case of error, return the error code we received including > -EPROBE_DEFER > > Signed-off-by: Peter Ujfalusi > CC: Ulf Hansson With the minor change above. Acked-by: Ulf Hansson Kind regards Uffe > --- > drivers/mmc/host/omap_hsmmc.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index 57bb85930f81..d252478391ee 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -2088,23 +2088,21 @@ static int omap_hsmmc_probe(struct platform_device *pdev) > dma_cap_zero(mask); > dma_cap_set(DMA_SLAVE, mask); > > - host->rx_chan = > - dma_request_slave_channel_compat(mask, omap_dma_filter_fn, > - &rx_req, &pdev->dev, "rx"); > + host->rx_chan = dma_request_slave_channel_compat_reason(mask, > + omap_dma_filter_fn, &rx_req, &pdev->dev, "rx"); > > - if (!host->rx_chan) { > + if (IS_ERR(host->rx_chan)) { > dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel %u\n", rx_req); > - ret = -ENXIO; > + ret = PTR_ERR(host->rx_chan); > goto err_irq; > } > > - host->tx_chan = > - dma_request_slave_channel_compat(mask, omap_dma_filter_fn, > - &tx_req, &pdev->dev, "tx"); > + host->tx_chan = dma_request_slave_channel_compat_reason(mask, > + omap_dma_filter_fn, &tx_req, &pdev->dev, "tx"); > > - if (!host->tx_chan) { > + if (IS_ERR(host->tx_chan)) { > dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel %u\n", tx_req); > - ret = -ENXIO; > + ret = PTR_ERR(host->tx_chan); > goto err_irq; > } > > @@ -2166,9 +2164,9 @@ err_slot_name: > if (host->use_reg) > omap_hsmmc_reg_put(host); > err_irq: > - if (host->tx_chan) > + if (!IS_ERR_OR_NULL(host->tx_chan)) > dma_release_channel(host->tx_chan); > - if (host->rx_chan) > + if (!IS_ERR_OR_NULL(host->rx_chan)) > dma_release_channel(host->rx_chan); > pm_runtime_put_sync(host->dev); > pm_runtime_disable(host->dev); > -- > 2.3.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html