linux-kernel - Re: [PATCH 05/13] mmc: omap_hsmmc: Support for deferred probing when requesting DMA channels

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPDyKFocEvZnV=BpPB8L3+XvS4YrMB9OJUW4_x=7H43mDww45Q@mail.gmail.com>
Date:	Thu, 28 May 2015 09:23:25 +0200
From:	Ulf Hansson <ulf.hansson@...aro.org>
To:	Peter Ujfalusi <peter.ujfalusi@...com>
Cc:	Vinod Koul <vinod.koul@...el.com>,
	Tony Lindgren <tony@...mide.com>,
	"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Dan Williams <dan.j.williams@...el.com>,
	dmaengine@...r.kernel.org, linux-serial@...r.kernel.org,
	linux-omap <linux-omap@...r.kernel.org>,
	linux-mmc <linux-mmc@...r.kernel.org>,
	linux-crypto@...r.kernel.org,
	"linux-spi@...r.kernel.org" <linux-spi@...r.kernel.org>,
	linux-media@...r.kernel.org, alsa-devel@...a-project.org
Subject: Re: [PATCH 05/13] mmc: omap_hsmmc: Support for deferred probing when
 requesting DMA channels

On 26 May 2015 at 15:26, Peter Ujfalusi <peter.ujfalusi@...com> 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 <peter.ujfalusi@...com>
> CC: Ulf Hansson <ulf.hansson@...aro.org>

With the minor change above.

Acked-by: Ulf Hansson <ulf.hansson@...aro.org>

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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/