From: Thomas Abraham <thomas.abraham@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vinod Koul <vinod.koul@intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Boojin Kim <boojin.kim@samsung.com>,
Kukjin Kim <kgene.kim@samsung.com>,
joe@perches.com
Subject: Re: linux-next: manual merge of the slave-dma tree with the s5p tree
Date: Fri, 11 Nov 2011 14:06:38 +0530 [thread overview]
Message-ID: <CAJuYYwR6Vt4dbio3hATkLgYPbo2sVVpjH85DE+AUOAGS9-r0rA@mail.gmail.com> (raw)
In-Reply-To: <20111111120013.e425db4686acbd346e10a49b@canb.auug.org.au>
Hi Stephen,
On 11 November 2011 06:30, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> drivers/dma/pl330.c between commit c6e00b47067b ("DMA: PL330: Add device
> tree support") from the s5p tree and commit dab6538e29e6 ("DMA: PL330:
> Fix build warning") from the slave-dma tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/dma/pl330.c
> index a626e15,186b822..0000000
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@@ -870,8 -856,8 +870,8 @@@ pl330_probe(struct amba_device *adev, c
> INIT_LIST_HEAD(&pd->channels);
>
> /* Initialize channel parameters */
> - num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
> - (u8)pi->pcfg.num_chan);
> - num_chan = max(pdat ? (int)pdat->nr_valid_peri : 0,
> - (int)pi->pcfg.num_chan);
> ++ num_chan = max(pdat ? (int)pdat->nr_valid_peri : (int)pi->pcfg.num_peri,
> ++ (int)pi->pcfg.num_chan);
> pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
>
> for (i = 0; i < num_chan; i++) {
>
Thanks for the fix.
Also taking into account the suggestion from Joe Perches, this change could be
> - num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
> - (u8)pi->pcfg.num_chan);
> - num_chan = max(pdat ? (int)pdat->nr_valid_peri : 0,
> - (int)pi->pcfg.num_chan);
> ++ num_chan = max_t(int, pdat ? pdat->nr_valid_peri : pi->pcfg.num_peri,
> ++ pi->pcfg.num_chan);
> pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
>
Regards,
Thomas.
next prev parent reply other threads:[~2011-11-11 8:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 1:00 linux-next: manual merge of the slave-dma tree with the s5p tree Stephen Rothwell
2011-11-11 8:36 ` Thomas Abraham [this message]
2011-11-21 0:08 Stephen Rothwell
2011-11-23 11:28 ` Vinod Koul
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=CAJuYYwR6Vt4dbio3hATkLgYPbo2sVVpjH85DE+AUOAGS9-r0rA@mail.gmail.com \
--to=thomas.abraham@linaro.org \
--cc=boojin.kim@samsung.com \
--cc=joe@perches.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vinod.koul@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).