| Message ID | 1248389413-19366-1-git-send-email-khilman@deeprootsystems.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Kevin Hilman <khilman@deeprootsystems.com> writes: > Fix deprecated use of DMA_nnBIT_MASK which now gives a compiler > warning. > > Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> > --- > This compiler warning patch is on top of the master branch of Mauro's > linux-next tree. Ping. This is needed on top of the DaVinci changes queued in the master branch of Mauro's linux-next.git. Kevin > arch/arm/mach-davinci/dm646x.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c > index 73a7e8b..8f38371 100644 > --- a/arch/arm/mach-davinci/dm646x.c > +++ b/arch/arm/mach-davinci/dm646x.c > @@ -720,7 +720,7 @@ static struct platform_device vpif_display_dev = { > .id = -1, > .dev = { > .dma_mask = &vpif_dma_mask, > - .coherent_dma_mask = DMA_32BIT_MASK, > + .coherent_dma_mask = DMA_BIT_MASK(32), > }, > .resource = vpif_resource, > .num_resources = ARRAY_SIZE(vpif_resource), > -- > 1.6.3.3
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 73a7e8b..8f38371 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -720,7 +720,7 @@ static struct platform_device vpif_display_dev = { .id = -1, .dev = { .dma_mask = &vpif_dma_mask, - .coherent_dma_mask = DMA_32BIT_MASK, + .coherent_dma_mask = DMA_BIT_MASK(32), }, .resource = vpif_resource, .num_resources = ARRAY_SIZE(vpif_resource),
Fix deprecated use of DMA_nnBIT_MASK which now gives a compiler warning. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> --- This compiler warning patch is on top of the master branch of Mauro's linux-next tree. arch/arm/mach-davinci/dm646x.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)