From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Ludovic Desroches <ludovic.desroches@atmel.com>,
linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org
Cc: chris@printf.net, ulf.hansson@linaro.org
Subject: Re: [RESEND PATCH 1/2] mmc: atmel-mci: remove compat for non DT board when requesting dma chan
Date: Fri, 14 Nov 2014 15:46:23 +0100 [thread overview]
Message-ID: <546615BF.4040608@atmel.com> (raw)
In-Reply-To: <1415975785-30303-1-git-send-email-ludovic.desroches@atmel.com>
On 14/11/2014 15:36, Ludovic Desroches :
> All boards with a dma controller have DT support so using
> dma_request_slave_channel_compat is no more needed.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Yes, sure.
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>
> Sorry for the noise, typo in cc list.
>
> drivers/mmc/host/atmel-mci.c | 20 +-------------------
> 1 file changed, 1 insertion(+), 19 deletions(-)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index a7b59ba..de2287c 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -2272,23 +2272,6 @@ static void atmci_cleanup_slot(struct atmel_mci_slot *slot,
> mmc_free_host(slot->mmc);
> }
>
> -static bool atmci_filter(struct dma_chan *chan, void *pdata)
> -{
> - struct mci_platform_data *sl_pdata = pdata;
> - struct mci_dma_data *sl;
> -
> - if (!sl_pdata)
> - return false;
> -
> - sl = sl_pdata->dma_slave;
> - if (sl && find_slave_dev(sl) == chan->device->dev) {
> - chan->private = slave_data_ptr(sl);
> - return true;
> - } else {
> - return false;
> - }
> -}
> -
> static bool atmci_configure_dma(struct atmel_mci *host)
> {
> struct mci_platform_data *pdata;
> @@ -2302,8 +2285,7 @@ static bool atmci_configure_dma(struct atmel_mci *host)
> dma_cap_zero(mask);
> dma_cap_set(DMA_SLAVE, mask);
>
> - host->dma.chan = dma_request_slave_channel_compat(mask, atmci_filter, pdata,
> - &host->pdev->dev, "rxtx");
> + host->dma.chan = dma_request_slave_channel(&host->pdev->dev, "rxtx");
> if (!host->dma.chan) {
> dev_warn(&host->pdev->dev, "no DMA channel available\n");
> return false;
>
--
Nicolas Ferre
WARNING: multiple messages have this Message-ID (diff)
From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [RESEND PATCH 1/2] mmc: atmel-mci: remove compat for non DT board when requesting dma chan
Date: Fri, 14 Nov 2014 15:46:23 +0100 [thread overview]
Message-ID: <546615BF.4040608@atmel.com> (raw)
In-Reply-To: <1415975785-30303-1-git-send-email-ludovic.desroches@atmel.com>
On 14/11/2014 15:36, Ludovic Desroches :
> All boards with a dma controller have DT support so using
> dma_request_slave_channel_compat is no more needed.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Yes, sure.
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>
> Sorry for the noise, typo in cc list.
>
> drivers/mmc/host/atmel-mci.c | 20 +-------------------
> 1 file changed, 1 insertion(+), 19 deletions(-)
>
> diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
> index a7b59ba..de2287c 100644
> --- a/drivers/mmc/host/atmel-mci.c
> +++ b/drivers/mmc/host/atmel-mci.c
> @@ -2272,23 +2272,6 @@ static void atmci_cleanup_slot(struct atmel_mci_slot *slot,
> mmc_free_host(slot->mmc);
> }
>
> -static bool atmci_filter(struct dma_chan *chan, void *pdata)
> -{
> - struct mci_platform_data *sl_pdata = pdata;
> - struct mci_dma_data *sl;
> -
> - if (!sl_pdata)
> - return false;
> -
> - sl = sl_pdata->dma_slave;
> - if (sl && find_slave_dev(sl) == chan->device->dev) {
> - chan->private = slave_data_ptr(sl);
> - return true;
> - } else {
> - return false;
> - }
> -}
> -
> static bool atmci_configure_dma(struct atmel_mci *host)
> {
> struct mci_platform_data *pdata;
> @@ -2302,8 +2285,7 @@ static bool atmci_configure_dma(struct atmel_mci *host)
> dma_cap_zero(mask);
> dma_cap_set(DMA_SLAVE, mask);
>
> - host->dma.chan = dma_request_slave_channel_compat(mask, atmci_filter, pdata,
> - &host->pdev->dev, "rxtx");
> + host->dma.chan = dma_request_slave_channel(&host->pdev->dev, "rxtx");
> if (!host->dma.chan) {
> dev_warn(&host->pdev->dev, "no DMA channel available\n");
> return false;
>
--
Nicolas Ferre
next prev parent reply other threads:[~2014-11-14 14:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-14 14:36 [RESEND PATCH 1/2] mmc: atmel-mci: remove compat for non DT board when requesting dma chan Ludovic Desroches
2014-11-14 14:36 ` Ludovic Desroches
2014-11-14 14:36 ` [RESEND PATCH 2/2] mmc: atmel-mci: introduce probe deferring Ludovic Desroches
2014-11-14 14:36 ` Ludovic Desroches
2014-11-14 14:55 ` Nicolas Ferre
2014-11-14 14:55 ` Nicolas Ferre
2014-11-14 15:14 ` Ludovic Desroches
2014-11-14 15:14 ` Ludovic Desroches
2014-11-14 14:46 ` Nicolas Ferre [this message]
2014-11-14 14:46 ` [RESEND PATCH 1/2] mmc: atmel-mci: remove compat for non DT board when requesting dma chan Nicolas Ferre
2014-11-19 10:45 ` Ulf Hansson
2014-11-19 10:45 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=546615BF.4040608@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=chris@printf.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ludovic.desroches@atmel.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.