* linux-next: manual merge of the slave-dma tree with the s5p tree
@ 2011-11-21 0:08 Stephen Rothwell
2011-11-23 11:28 ` Vinod Koul
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2011-11-21 0:08 UTC (permalink / raw)
To: Vinod Koul; +Cc: linux-next, linux-kernel, Thomas Abraham, Kukjin Kim
[-- Attachment #1: Type: text/plain, Size: 517 bytes --]
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/pl330.c between commit fc0b5cccc8dd ("DMA: PL330: Infer
transfer direction from transfer request instead of platform data") from
the s5p tree and commit db8196df4bb6 ("dmaengine: move drivers to
dma_transfer_direction") from the slave-dma tree.
The former removed the code modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the slave-dma tree with the s5p tree
2011-11-21 0:08 linux-next: manual merge of the slave-dma tree with the s5p tree Stephen Rothwell
@ 2011-11-23 11:28 ` Vinod Koul
0 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2011-11-23 11:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Thomas Abraham, Kukjin Kim
On Mon, 2011-11-21 at 11:08 +1100, Stephen Rothwell wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> drivers/dma/pl330.c between commit fc0b5cccc8dd ("DMA: PL330: Infer
> transfer direction from transfer request instead of platform data") from
> the s5p tree and commit db8196df4bb6 ("dmaengine: move drivers to
> dma_transfer_direction") from the slave-dma tree.
>
> The former removed the code modified by the latter, so I did that.
Thanks Stephan,
It seems to be the right fix
--
~Vinod
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the slave-dma tree with the s5p tree
2011-11-11 1:00 Stephen Rothwell
@ 2011-11-11 8:36 ` Thomas Abraham
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Abraham @ 2011-11-11 8:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Vinod Koul, linux-next, linux-kernel, Boojin Kim, Kukjin Kim, joe
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the slave-dma tree with the s5p tree
@ 2011-11-11 1:00 Stephen Rothwell
2011-11-11 8:36 ` Thomas Abraham
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2011-11-11 1:00 UTC (permalink / raw)
To: Vinod Koul
Cc: linux-next, linux-kernel, Boojin Kim, Thomas Abraham, Kukjin Kim
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
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++) {
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-23 11:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-21 0:08 linux-next: manual merge of the slave-dma tree with the s5p tree Stephen Rothwell
2011-11-23 11:28 ` Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2011-11-11 1:00 Stephen Rothwell
2011-11-11 8:36 ` Thomas Abraham
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).