* [PATCH] MIPS: Alchemy: fix deprecated compile warnings
@ 2010-06-23 16:26 FUJITA Tomonori
2010-06-23 16:31 ` Manuel Lauss
0 siblings, 1 reply; 3+ messages in thread
From: FUJITA Tomonori @ 2010-06-23 16:26 UTC (permalink / raw)
To: linux-mips; +Cc: ralf, manuel.lauss
I got the following errors on linux-next. They might be already
addressed (I've not subscribed to linux-mips@linux-mips), but anyway
here's a fix.
=
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Subject: [PATCH] MIPS: Alchemy: fix deprecated compile warnings
replace deprecated DMA_32BIT_MASK with DMA_BIT_MASK.
cc1: warnings being treated as errors
arch/mips/alchemy/devboards/db1200/platform.c:219: error: 'DMA_nnBIT_MASK' is deprecated
arch/mips/alchemy/devboards/db1200/platform.c:226: error: 'DMA_nnBIT_MASK' is deprecated
arch/mips/alchemy/devboards/db1200/platform.c:388: error: 'DMA_nnBIT_MASK' is deprecated
arch/mips/alchemy/devboards/db1200/platform.c:393: error: 'DMA_nnBIT_MASK' is deprecated
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
arch/mips/alchemy/devboards/db1200/platform.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c
index 3cb95a9..3fa34c3 100644
--- a/arch/mips/alchemy/devboards/db1200/platform.c
+++ b/arch/mips/alchemy/devboards/db1200/platform.c
@@ -216,14 +216,14 @@ static struct resource db1200_ide_res[] = {
}
};
-static u64 ide_dmamask = DMA_32BIT_MASK;
+static u64 ide_dmamask = DMA_BIT_MASK(32);
static struct platform_device db1200_ide_dev = {
.name = "au1200-ide",
.id = 0,
.dev = {
.dma_mask = &ide_dmamask,
- .coherent_dma_mask = DMA_32BIT_MASK,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
},
.num_resources = ARRAY_SIZE(db1200_ide_res),
.resource = db1200_ide_res,
@@ -385,12 +385,12 @@ static struct au1550_spi_info db1200_spi_platdata = {
.activate_cs = db1200_spi_cs_en,
};
-static u64 spi_dmamask = DMA_32BIT_MASK;
+static u64 spi_dmamask = DMA_BIT_MASK(32);
static struct platform_device db1200_spi_dev = {
.dev = {
.dma_mask = &spi_dmamask,
- .coherent_dma_mask = DMA_32BIT_MASK,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &db1200_spi_platdata,
},
.name = "au1550-spi",
--
1.6.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: Alchemy: fix deprecated compile warnings
2010-06-23 16:26 [PATCH] MIPS: Alchemy: fix deprecated compile warnings FUJITA Tomonori
@ 2010-06-23 16:31 ` Manuel Lauss
2010-07-06 13:01 ` Ralf Baechle
0 siblings, 1 reply; 3+ messages in thread
From: Manuel Lauss @ 2010-06-23 16:31 UTC (permalink / raw)
To: FUJITA Tomonori; +Cc: linux-mips, ralf, manuel.lauss
On Wed, Jun 23, 2010 at 6:26 PM, FUJITA Tomonori
<fujita.tomonori@lab.ntt.co.jp> wrote:
> I got the following errors on linux-next. They might be already
> addressed (I've not subscribed to linux-mips@linux-mips), but anyway
> here's a fix.
>
> =
> From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Subject: [PATCH] MIPS: Alchemy: fix deprecated compile warnings
>
> replace deprecated DMA_32BIT_MASK with DMA_BIT_MASK.
>
> cc1: warnings being treated as errors
> arch/mips/alchemy/devboards/db1200/platform.c:219: error: 'DMA_nnBIT_MASK' is deprecated
> arch/mips/alchemy/devboards/db1200/platform.c:226: error: 'DMA_nnBIT_MASK' is deprecated
> arch/mips/alchemy/devboards/db1200/platform.c:388: error: 'DMA_nnBIT_MASK' is deprecated
> arch/mips/alchemy/devboards/db1200/platform.c:393: error: 'DMA_nnBIT_MASK' is deprecated
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> ---
> arch/mips/alchemy/devboards/db1200/platform.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
Acked-by: Manuel Lauss <manuel.lauss@googlemail.com>
Thank you!
Manuel Lauss
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: Alchemy: fix deprecated compile warnings
2010-06-23 16:31 ` Manuel Lauss
@ 2010-07-06 13:01 ` Ralf Baechle
0 siblings, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2010-07-06 13:01 UTC (permalink / raw)
To: Manuel Lauss; +Cc: FUJITA Tomonori, linux-mips, manuel.lauss
On Wed, Jun 23, 2010 at 06:31:18PM +0200, Manuel Lauss wrote:
> > replace deprecated DMA_32BIT_MASK with DMA_BIT_MASK.
> >
> > cc1: warnings being treated as errors
> > arch/mips/alchemy/devboards/db1200/platform.c:219: error: 'DMA_nnBIT_MASK' is deprecated
> > arch/mips/alchemy/devboards/db1200/platform.c:226: error: 'DMA_nnBIT_MASK' is deprecated
> > arch/mips/alchemy/devboards/db1200/platform.c:388: error: 'DMA_nnBIT_MASK' is deprecated
> > arch/mips/alchemy/devboards/db1200/platform.c:393: error: 'DMA_nnBIT_MASK' is deprecated
> >
> > Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> > ---
> > arch/mips/alchemy/devboards/db1200/platform.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
>
> Acked-by: Manuel Lauss <manuel.lauss@googlemail.com>
Thanks, Fujita-San. Patch applied.
This one became necessary due to the migration to the new MIPS platform
makefiles which also enable -Werror for all platforms and
arch/mips/alchemy/devboards/db1200/ was previously one of the few
subdirs still getting built without -Werror.
Ralf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-06 13:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-23 16:26 [PATCH] MIPS: Alchemy: fix deprecated compile warnings FUJITA Tomonori
2010-06-23 16:31 ` Manuel Lauss
2010-07-06 13:01 ` Ralf Baechle
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).