From: Vinod Koul <vinod.koul@intel.com>
To: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Dan Williams <dan.j.williams@intel.com>,
dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: Re: [PATCH] dmaengine: k3: Fix duplicated function name and allmodconfig build
Date: Tue, 13 Jan 2015 21:15:32 +0530 [thread overview]
Message-ID: <20150113154532.GG3085@intel.com> (raw)
In-Reply-To: <1419858090-7682-1-git-send-email-k.kozlowski@samsung.com>
On Mon, Dec 29, 2014 at 02:01:30PM +0100, Krzysztof Kozlowski wrote:
> While splitting device control in db08425ebd51 ("dmaengine: k3:
> Split device_control") new function with the same 'k3_dma_resume' name
> was added, leading to build error:
>
> drivers/dma/k3dma.c:823:12: error: conflicting types for ‘k3_dma_resume’
> drivers/dma/k3dma.c:625:12: note: previous definition of ‘k3_dma_resume’ was here
>
Applied, thanks
--
~Vinod
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
> drivers/dma/k3dma.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
> index 49be7f687c4c..a4ff7e9e68be 100644
> --- a/drivers/dma/k3dma.c
> +++ b/drivers/dma/k3dma.c
> @@ -601,7 +601,7 @@ static int k3_dma_terminate_all(struct dma_chan *chan)
> return 0;
> }
>
> -static int k3_dma_pause(struct dma_chan *chan)
> +static int k3_dma_transfer_pause(struct dma_chan *chan)
> {
> struct k3_dma_chan *c = to_k3_chan(chan);
> struct k3_dma_dev *d = to_k3_dma(chan->device);
> @@ -622,7 +622,7 @@ static int k3_dma_pause(struct dma_chan *chan)
> return 0;
> }
>
> -static int k3_dma_resume(struct dma_chan *chan)
> +static int k3_dma_transfer_resume(struct dma_chan *chan)
> {
> struct k3_dma_chan *c = to_k3_chan(chan);
> struct k3_dma_dev *d = to_k3_dma(chan->device);
> @@ -735,8 +735,8 @@ static int k3_dma_probe(struct platform_device *op)
> d->slave.device_prep_slave_sg = k3_dma_prep_slave_sg;
> d->slave.device_issue_pending = k3_dma_issue_pending;
> d->slave.device_config = k3_dma_config;
> - d->slave.device_pause = k3_dma_pause;
> - d->slave.device_resume = k3_dma_resume;
> + d->slave.device_pause = k3_dma_transfer_pause;
> + d->slave.device_resume = k3_dma_transfer_resume;
> d->slave.device_terminate_all = k3_dma_terminate_all;
> d->slave.copy_align = DMA_ALIGN;
>
> --
> 1.9.1
>
--
prev parent reply other threads:[~2015-01-13 15:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-29 13:01 [PATCH] dmaengine: k3: Fix duplicated function name and allmodconfig build Krzysztof Kozlowski
2015-01-09 14:32 ` Krzysztof Kozlowski
2015-01-13 15:45 ` Vinod Koul [this message]
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=20150113154532.GG3085@intel.com \
--to=vinod.koul@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
/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.