* [PATCH 6/9] pcmcia: fix Alchemy warnings
[not found] <20080530212821.GA30197@comet.dominikbrodowski.net>
@ 2008-05-30 21:31 ` Dominik Brodowski
2008-05-30 21:31 ` Dominik Brodowski
2008-06-13 14:02 ` Ralf Baechle
0 siblings, 2 replies; 4+ messages in thread
From: Dominik Brodowski @ 2008-05-30 21:31 UTC (permalink / raw)
To: linux-pcmcia; +Cc: Sergei Shtylyov, Dominik Brodowski, linux-mips
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Fix the following warnings:
drivers/pcmcia/au1000_generic.c: In function `au1x00_pcmcia_socket_probe':
drivers/pcmcia/au1000_generic.c:405: warning: integer constant is too large for
"long" type
drivers/pcmcia/au1000_generic.c:413: warning: integer constant is too large for
"long" type
by properly postfixing the socket constants. While at it, fix the lines over 80
characters long in the vicinity...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
CC: linux-mips@linux-mips.org
---
drivers/pcmcia/au1000_generic.h | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h
index 1e467bb..c62437d 100644
--- a/drivers/pcmcia/au1000_generic.h
+++ b/drivers/pcmcia/au1000_generic.h
@@ -34,9 +34,9 @@
#define AU1000_PCMCIA_IO_SPEED (255)
#define AU1000_PCMCIA_MEM_SPEED (300)
-#define AU1X_SOCK0_IO 0xF00000000
-#define AU1X_SOCK0_PHYS_ATTR 0xF40000000
-#define AU1X_SOCK0_PHYS_MEM 0xF80000000
+#define AU1X_SOCK0_IO 0xF00000000ULL
+#define AU1X_SOCK0_PHYS_ATTR 0xF40000000ULL
+#define AU1X_SOCK0_PHYS_MEM 0xF80000000ULL
/* pseudo 32 bit phys addresses, which get fixed up to the
* real 36 bit address in fixup_bigphys_addr() */
#define AU1X_SOCK0_PSEUDO_PHYS_ATTR 0xF4000000
@@ -45,16 +45,20 @@
/* pcmcia socket 1 needs external glue logic so the memory map
* differs from board to board.
*/
-#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_PB1200)
-#define AU1X_SOCK1_IO 0xF08000000
-#define AU1X_SOCK1_PHYS_ATTR 0xF48000000
-#define AU1X_SOCK1_PHYS_MEM 0xF88000000
+#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || \
+ defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || \
+ defined(CONFIG_MIPS_PB1200)
+#define AU1X_SOCK1_IO 0xF08000000ULL
+#define AU1X_SOCK1_PHYS_ATTR 0xF48000000ULL
+#define AU1X_SOCK1_PHYS_MEM 0xF88000000ULL
#define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000
#define AU1X_SOCK1_PSEUDO_PHYS_MEM 0xF8800000
-#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || defined(CONFIG_MIPS_DB1200)
-#define AU1X_SOCK1_IO 0xF04000000
-#define AU1X_SOCK1_PHYS_ATTR 0xF44000000
-#define AU1X_SOCK1_PHYS_MEM 0xF84000000
+#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || \
+ defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || \
+ defined(CONFIG_MIPS_DB1200)
+#define AU1X_SOCK1_IO 0xF04000000ULL
+#define AU1X_SOCK1_PHYS_ATTR 0xF44000000ULL
+#define AU1X_SOCK1_PHYS_MEM 0xF84000000ULL
#define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4400000
#define AU1X_SOCK1_PSEUDO_PHYS_MEM 0xF8400000
#endif
--
1.5.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 6/9] pcmcia: fix Alchemy warnings
2008-05-30 21:31 ` [PATCH 6/9] pcmcia: fix Alchemy warnings Dominik Brodowski
@ 2008-05-30 21:31 ` Dominik Brodowski
2008-06-13 14:02 ` Ralf Baechle
1 sibling, 0 replies; 4+ messages in thread
From: Dominik Brodowski @ 2008-05-30 21:31 UTC (permalink / raw)
To: linux-pcmcia; +Cc: Sergei Shtylyov, Dominik Brodowski, linux-mips
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Fix the following warnings:
drivers/pcmcia/au1000_generic.c: In function `au1x00_pcmcia_socket_probe':
drivers/pcmcia/au1000_generic.c:405: warning: integer constant is too large for
"long" type
drivers/pcmcia/au1000_generic.c:413: warning: integer constant is too large for
"long" type
by properly postfixing the socket constants. While at it, fix the lines over 80
characters long in the vicinity...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
CC: linux-mips@linux-mips.org
---
drivers/pcmcia/au1000_generic.h | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h
index 1e467bb..c62437d 100644
--- a/drivers/pcmcia/au1000_generic.h
+++ b/drivers/pcmcia/au1000_generic.h
@@ -34,9 +34,9 @@
#define AU1000_PCMCIA_IO_SPEED (255)
#define AU1000_PCMCIA_MEM_SPEED (300)
-#define AU1X_SOCK0_IO 0xF00000000
-#define AU1X_SOCK0_PHYS_ATTR 0xF40000000
-#define AU1X_SOCK0_PHYS_MEM 0xF80000000
+#define AU1X_SOCK0_IO 0xF00000000ULL
+#define AU1X_SOCK0_PHYS_ATTR 0xF40000000ULL
+#define AU1X_SOCK0_PHYS_MEM 0xF80000000ULL
/* pseudo 32 bit phys addresses, which get fixed up to the
* real 36 bit address in fixup_bigphys_addr() */
#define AU1X_SOCK0_PSEUDO_PHYS_ATTR 0xF4000000
@@ -45,16 +45,20 @@
/* pcmcia socket 1 needs external glue logic so the memory map
* differs from board to board.
*/
-#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_PB1200)
-#define AU1X_SOCK1_IO 0xF08000000
-#define AU1X_SOCK1_PHYS_ATTR 0xF48000000
-#define AU1X_SOCK1_PHYS_MEM 0xF88000000
+#if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100) || \
+ defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1550) || \
+ defined(CONFIG_MIPS_PB1200)
+#define AU1X_SOCK1_IO 0xF08000000ULL
+#define AU1X_SOCK1_PHYS_ATTR 0xF48000000ULL
+#define AU1X_SOCK1_PHYS_MEM 0xF88000000ULL
#define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000
#define AU1X_SOCK1_PSEUDO_PHYS_MEM 0xF8800000
-#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || defined(CONFIG_MIPS_DB1200)
-#define AU1X_SOCK1_IO 0xF04000000
-#define AU1X_SOCK1_PHYS_ATTR 0xF44000000
-#define AU1X_SOCK1_PHYS_MEM 0xF84000000
+#elif defined(CONFIG_MIPS_DB1000) || defined(CONFIG_MIPS_DB1100) || \
+ defined(CONFIG_MIPS_DB1500) || defined(CONFIG_MIPS_DB1550) || \
+ defined(CONFIG_MIPS_DB1200)
+#define AU1X_SOCK1_IO 0xF04000000ULL
+#define AU1X_SOCK1_PHYS_ATTR 0xF44000000ULL
+#define AU1X_SOCK1_PHYS_MEM 0xF84000000ULL
#define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4400000
#define AU1X_SOCK1_PSEUDO_PHYS_MEM 0xF8400000
#endif
--
1.5.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 6/9] pcmcia: fix Alchemy warnings
2008-05-30 21:31 ` [PATCH 6/9] pcmcia: fix Alchemy warnings Dominik Brodowski
2008-05-30 21:31 ` Dominik Brodowski
@ 2008-06-13 14:02 ` Ralf Baechle
2008-06-13 18:24 ` Dominik Brodowski
1 sibling, 1 reply; 4+ messages in thread
From: Ralf Baechle @ 2008-06-13 14:02 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: linux-pcmcia, Sergei Shtylyov, linux-mips
On Fri, May 30, 2008 at 11:31:16PM +0200, Dominik Brodowski wrote:
> Subject: [PATCH 6/9] pcmcia: fix Alchemy warnings
>
> From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>
> Fix the following warnings:
>
> drivers/pcmcia/au1000_generic.c: In function `au1x00_pcmcia_socket_probe':
> drivers/pcmcia/au1000_generic.c:405: warning: integer constant is too large for
> "long" type
> drivers/pcmcia/au1000_generic.c:413: warning: integer constant is too large for
> "long" type
>
> by properly postfixing the socket constants. While at it, fix the lines over 80
> characters long in the vicinity...
>
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
> CC: linux-mips@linux-mips.org
Any reason why this patch still isn't merged? It looks right and seems to
do what it promised,
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Ralf
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 6/9] pcmcia: fix Alchemy warnings
2008-06-13 14:02 ` Ralf Baechle
@ 2008-06-13 18:24 ` Dominik Brodowski
0 siblings, 0 replies; 4+ messages in thread
From: Dominik Brodowski @ 2008-06-13 18:24 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-pcmcia, Sergei Shtylyov, linux-mips
Hi,
On Fri, Jun 13, 2008 at 03:02:58PM +0100, Ralf Baechle wrote:
> On Fri, May 30, 2008 at 11:31:16PM +0200, Dominik Brodowski wrote:
>
> > Subject: [PATCH 6/9] pcmcia: fix Alchemy warnings
> >
> > From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> >
> > Fix the following warnings:
> >
> > drivers/pcmcia/au1000_generic.c: In function `au1x00_pcmcia_socket_probe':
> > drivers/pcmcia/au1000_generic.c:405: warning: integer constant is too large for
> > "long" type
> > drivers/pcmcia/au1000_generic.c:413: warning: integer constant is too large for
> > "long" type
> >
> > by properly postfixing the socket constants. While at it, fix the lines over 80
> > characters long in the vicinity...
> >
> > Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> > Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
> > CC: linux-mips@linux-mips.org
>
> Any reason why this patch still isn't merged? It looks right and seems to
> do what it promised,
It's in the queue for what is to be merged for 2.6.27-rc1.
Best,
Dominik
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-06-13 18:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20080530212821.GA30197@comet.dominikbrodowski.net>
2008-05-30 21:31 ` [PATCH 6/9] pcmcia: fix Alchemy warnings Dominik Brodowski
2008-05-30 21:31 ` Dominik Brodowski
2008-06-13 14:02 ` Ralf Baechle
2008-06-13 18:24 ` Dominik Brodowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox