[PATCH 0/3] new ARM-soc warning fixes

[PATCH 0/3] new ARM-soc warning fixes

[Arnd Bergmann]

Hi Olof,

Here are three more fixes that I'd like to merge through the arm-soc
as time permits. All of them should be completely harmless and they
only fix harmless gcc warnings.

I don't know what your plans are for sending the next fixes branch.
I've uploaded these into a new "fixes2" branch on top of the patches
that are already in "fixes". We can either send them all together,
or you send the ones that are already queued first and these ones
with the next batch. Feel free to rebase if necessary.

	Arnd

Arnd Bergmann (3):
  ARM: shmobile: mark shmobile_init_late as __init
  ARM: assabet: fix bogus warning in get_assabet_scr (again)
  ARM: integrator: use __iomem pointers for MMIO, part 2

 arch/arm/mach-integrator/include/mach/cm.h       |    2 +-
 arch/arm/mach-integrator/include/mach/platform.h |    6 +++---
 arch/arm/mach-integrator/integrator_ap.c         |    2 +-
 arch/arm/mach-integrator/integrator_cp.c         |    4 ++--
 arch/arm/mach-sa1100/assabet.c                   |    2 +-
 arch/arm/mach-shmobile/include/mach/common.h     |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

-- 
1.7.10

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Magnus Damm <damm@opensource.se>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Simon Horman <horms@verge.net.au>

[PATCH 0/3] new ARM-soc warning fixes

[Arnd Bergmann]

Hi Olof,

Here are three more fixes that I'd like to merge through the arm-soc
as time permits. All of them should be completely harmless and they
only fix harmless gcc warnings.

I don't know what your plans are for sending the next fixes branch.
I've uploaded these into a new "fixes2" branch on top of the patches
that are already in "fixes". We can either send them all together,
or you send the ones that are already queued first and these ones
with the next batch. Feel free to rebase if necessary.

	Arnd

Arnd Bergmann (3):
  ARM: shmobile: mark shmobile_init_late as __init
  ARM: assabet: fix bogus warning in get_assabet_scr (again)
  ARM: integrator: use __iomem pointers for MMIO, part 2

 arch/arm/mach-integrator/include/mach/cm.h       |    2 +-
 arch/arm/mach-integrator/include/mach/platform.h |    6 +++---
 arch/arm/mach-integrator/integrator_ap.c         |    2 +-
 arch/arm/mach-integrator/integrator_cp.c         |    4 ++--
 arch/arm/mach-sa1100/assabet.c                   |    2 +-
 arch/arm/mach-shmobile/include/mach/common.h     |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

-- 
1.7.10

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Magnus Damm <damm@opensource.se>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Simon Horman <horms@verge.net.au>

[PATCH 1/3] ARM: shmobile: mark shmobile_init_late as __init

[Arnd Bergmann]

Patch 35f2b0bd59 "ARM: shmobile: Move definition of shmobile_init_late()
to header" moved the definition of the shmobile_init_late function, but
dropped the __init annotation, which is now causing warnings because
the function calls shmobile_suspend_init, which is also marked init.

Without this patch, building kota2_defconfig results in:

WARNING: vmlinux.o(.text+0xb7c8): Section mismatch in reference from the function shmobile_init_late() to the function .init.text:shmobile_suspend_init()
The function shmobile_init_late() references
the function __init shmobile_suspend_init().
This is often because shmobile_init_late lacks a __init
annotation or the annotation of shmobile_suspend_init is wrong.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Magnus Damm <damm@opensource.se>
Cc: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/include/mach/common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index ed77ab8..d47e215 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -100,7 +100,7 @@ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; }
 
 extern void shmobile_smp_init_cpus(unsigned int ncores);
 
-static inline void shmobile_init_late(void)
+static inline void __init shmobile_init_late(void)
 {
 	shmobile_suspend_init();
 	shmobile_cpuidle_init();
-- 
1.7.10

[PATCH 1/3] ARM: shmobile: mark shmobile_init_late as __init

[Arnd Bergmann]

Patch 35f2b0bd59 "ARM: shmobile: Move definition of shmobile_init_late()
to header" moved the definition of the shmobile_init_late function, but
dropped the __init annotation, which is now causing warnings because
the function calls shmobile_suspend_init, which is also marked init.

Without this patch, building kota2_defconfig results in:

WARNING: vmlinux.o(.text+0xb7c8): Section mismatch in reference from the function shmobile_init_late() to the function .init.text:shmobile_suspend_init()
The function shmobile_init_late() references
the function __init shmobile_suspend_init().
This is often because shmobile_init_late lacks a __init
annotation or the annotation of shmobile_suspend_init is wrong.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Magnus Damm <damm@opensource.se>
Cc: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/include/mach/common.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index ed77ab8..d47e215 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -100,7 +100,7 @@ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; }
 
 extern void shmobile_smp_init_cpus(unsigned int ncores);
 
-static inline void shmobile_init_late(void)
+static inline void __init shmobile_init_late(void)
 {
 	shmobile_suspend_init();
 	shmobile_cpuidle_init();
-- 
1.7.10

[PATCH 2/3] ARM: assabet: fix bogus warning in get_assabet_scr (again)

[Arnd Bergmann]

Russell fixed this bogus warning before in 2f3eca8b4f "Shut up gcc
warning in assabet.c", but apparently gcc has become smarter (or dumber)
since 2005, and the same warning came up again.

This uses the uninitialized_var() macro to convince gcc that the
variable is actually being initialized. 100 times in fact.

Without this patch, building assabet_defconfig results in:

arch/arm/mach-sa1100/assabet.c: In function 'fixup_assabet':
arch/arm/mach-sa1100/assabet.c:397:6: warning: 'scr' may be used uninitialized in this function [-Wuninitialized]
arch/arm/mach-sa1100/assabet.c:389:16: note: 'scr' was declared here

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-sa1100/assabet.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index e1ccda6..6a7ad3c 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -388,7 +388,7 @@ static void __init map_sa1100_gpio_regs( void )
  */
 static void __init get_assabet_scr(void)
 {
-	unsigned long scr, i;
+	unsigned long uninitialized_var(scr), i;
 
 	GPDR |= 0x3fc;			/* Configure GPIO 9:2 as outputs */
 	GPSR = 0x3fc;			/* Write 0xFF to GPIO 9:2 */
-- 
1.7.10

[PATCH 2/3] ARM: assabet: fix bogus warning in get_assabet_scr (again)

[Arnd Bergmann]

Russell fixed this bogus warning before in 2f3eca8b4f "Shut up gcc
warning in assabet.c", but apparently gcc has become smarter (or dumber)
since 2005, and the same warning came up again.

This uses the uninitialized_var() macro to convince gcc that the
variable is actually being initialized. 100 times in fact.

Without this patch, building assabet_defconfig results in:

arch/arm/mach-sa1100/assabet.c: In function 'fixup_assabet':
arch/arm/mach-sa1100/assabet.c:397:6: warning: 'scr' may be used uninitialized in this function [-Wuninitialized]
arch/arm/mach-sa1100/assabet.c:389:16: note: 'scr' was declared here

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-sa1100/assabet.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index e1ccda6..6a7ad3c 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -388,7 +388,7 @@ static void __init map_sa1100_gpio_regs( void )
  */
 static void __init get_assabet_scr(void)
 {
-	unsigned long scr, i;
+	unsigned long uninitialized_var(scr), i;
 
 	GPDR |= 0x3fc;			/* Configure GPIO 9:2 as outputs */
 	GPSR = 0x3fc;			/* Write 0xFF to GPIO 9:2 */
-- 
1.7.10

[PATCH 3/3] ARM: integrator: use __iomem pointers for MMIO, part 2

[Arnd Bergmann]

Due to some interesting merges in the integrator code, not
all users of mmio pointers were converted before, this
fixes all warnings that got introduced as a consequence.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-integrator/include/mach/cm.h       |    2 +-
 arch/arm/mach-integrator/include/mach/platform.h |    6 +++---
 arch/arm/mach-integrator/integrator_ap.c         |    2 +-
 arch/arm/mach-integrator/integrator_cp.c         |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-integrator/include/mach/cm.h b/arch/arm/mach-integrator/include/mach/cm.h
index 1a78692e..202e6a5 100644
--- a/arch/arm/mach-integrator/include/mach/cm.h
+++ b/arch/arm/mach-integrator/include/mach/cm.h
@@ -3,7 +3,7 @@
  */
 void cm_control(u32, u32);
 
-#define CM_CTRL	IO_ADDRESS(INTEGRATOR_HDR_CTRL)
+#define CM_CTRL	__io_address(INTEGRATOR_HDR_CTRL)
 
 #define CM_CTRL_LED			(1 << 0)
 #define CM_CTRL_nMBDET			(1 << 1)
diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h
index 4c03475..efeac5d 100644
--- a/arch/arm/mach-integrator/include/mach/platform.h
+++ b/arch/arm/mach-integrator/include/mach/platform.h
@@ -324,9 +324,9 @@
  */
 #define PHYS_PCI_V3_BASE                0x62000000
 
-#define PCI_MEMORY_VADDR		0xe8000000
-#define PCI_CONFIG_VADDR		0xec000000
-#define PCI_V3_VADDR			0xed000000
+#define PCI_MEMORY_VADDR		IOMEM(0xe8000000)
+#define PCI_CONFIG_VADDR		IOMEM(0xec000000)
+#define PCI_V3_VADDR			IOMEM(0xed000000)
 
 /* ------------------------------------------------------------------------
  *  Integrator Interrupt Controllers
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index d5b5435a..e6617c1 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -157,7 +157,7 @@ static struct map_desc ap_io_desc[] __initdata = {
 static void __init ap_map_io(void)
 {
 	iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
-	vga_base = PCI_MEMORY_VADDR;
+	vga_base = (unsigned long)PCI_MEMORY_VADDR;
 	pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));
 }
 
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 6870a1f..5b08e8e 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -261,6 +261,8 @@ static void __init intcp_init_early(void)
 #endif
 }
 
+#ifdef CONFIG_OF
+
 static void __init intcp_timer_init_of(void)
 {
 	struct device_node *node;
@@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = {
 	.init		= intcp_timer_init_of,
 };
 
-#ifdef CONFIG_OF
-
 static const struct of_device_id fpga_irq_of_match[] __initconst = {
 	{ .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },
 	{ /* Sentinel */ }
-- 
1.7.10

[PATCH 3/3] ARM: integrator: use __iomem pointers for MMIO, part 2

[Arnd Bergmann]

Due to some interesting merges in the integrator code, not
all users of mmio pointers were converted before, this
fixes all warnings that got introduced as a consequence.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-integrator/include/mach/cm.h       |    2 +-
 arch/arm/mach-integrator/include/mach/platform.h |    6 +++---
 arch/arm/mach-integrator/integrator_ap.c         |    2 +-
 arch/arm/mach-integrator/integrator_cp.c         |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-integrator/include/mach/cm.h b/arch/arm/mach-integrator/include/mach/cm.h
index 1a78692e..202e6a5 100644
--- a/arch/arm/mach-integrator/include/mach/cm.h
+++ b/arch/arm/mach-integrator/include/mach/cm.h
@@ -3,7 +3,7 @@
  */
 void cm_control(u32, u32);
 
-#define CM_CTRL	IO_ADDRESS(INTEGRATOR_HDR_CTRL)
+#define CM_CTRL	__io_address(INTEGRATOR_HDR_CTRL)
 
 #define CM_CTRL_LED			(1 << 0)
 #define CM_CTRL_nMBDET			(1 << 1)
diff --git a/arch/arm/mach-integrator/include/mach/platform.h b/arch/arm/mach-integrator/include/mach/platform.h
index 4c03475..efeac5d 100644
--- a/arch/arm/mach-integrator/include/mach/platform.h
+++ b/arch/arm/mach-integrator/include/mach/platform.h
@@ -324,9 +324,9 @@
  */
 #define PHYS_PCI_V3_BASE                0x62000000
 
-#define PCI_MEMORY_VADDR		0xe8000000
-#define PCI_CONFIG_VADDR		0xec000000
-#define PCI_V3_VADDR			0xed000000
+#define PCI_MEMORY_VADDR		IOMEM(0xe8000000)
+#define PCI_CONFIG_VADDR		IOMEM(0xec000000)
+#define PCI_V3_VADDR			IOMEM(0xed000000)
 
 /* ------------------------------------------------------------------------
  *  Integrator Interrupt Controllers
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index d5b5435a..e6617c1 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -157,7 +157,7 @@ static struct map_desc ap_io_desc[] __initdata = {
 static void __init ap_map_io(void)
 {
 	iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
-	vga_base = PCI_MEMORY_VADDR;
+	vga_base = (unsigned long)PCI_MEMORY_VADDR;
 	pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));
 }
 
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 6870a1f..5b08e8e 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -261,6 +261,8 @@ static void __init intcp_init_early(void)
 #endif
 }
 
+#ifdef CONFIG_OF
+
 static void __init intcp_timer_init_of(void)
 {
 	struct device_node *node;
@@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = {
 	.init		= intcp_timer_init_of,
 };
 
-#ifdef CONFIG_OF
-
 static const struct of_device_id fpga_irq_of_match[] __initconst = {
 	{ .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },
 	{ /* Sentinel */ }
-- 
1.7.10

Re: [PATCH 0/3] new ARM-soc warning fixes

[Olof Johansson]

On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
> Hi Olof,
> 
> Here are three more fixes that I'd like to merge through the arm-soc
> as time permits. All of them should be completely harmless and they
> only fix harmless gcc warnings.
> 
> I don't know what your plans are for sending the next fixes branch.
> I've uploaded these into a new "fixes2" branch on top of the patches
> that are already in "fixes". We can either send them all together,
> or you send the ones that are already queued first and these ones
> with the next batch. Feel free to rebase if necessary.

I've pulled it in and will send up with fixes tonight (Tony has OMAP
fixes coming, others might too).


-Olof

[PATCH 0/3] new ARM-soc warning fixes

[Olof Johansson]

On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
> Hi Olof,
> 
> Here are three more fixes that I'd like to merge through the arm-soc
> as time permits. All of them should be completely harmless and they
> only fix harmless gcc warnings.
> 
> I don't know what your plans are for sending the next fixes branch.
> I've uploaded these into a new "fixes2" branch on top of the patches
> that are already in "fixes". We can either send them all together,
> or you send the ones that are already queued first and these ones
> with the next batch. Feel free to rebase if necessary.

I've pulled it in and will send up with fixes tonight (Tony has OMAP
fixes coming, others might too).


-Olof

Re: [PATCH 0/3] new ARM-soc warning fixes

[Arnd Bergmann]

On Tuesday 09 October 2012, Olof Johansson wrote:
> On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
> > Hi Olof,
> > 
> > Here are three more fixes that I'd like to merge through the arm-soc
> > as time permits. All of them should be completely harmless and they
> > only fix harmless gcc warnings.
> > 
> > I don't know what your plans are for sending the next fixes branch.
> > I've uploaded these into a new "fixes2" branch on top of the patches
> > that are already in "fixes". We can either send them all together,
> > or you send the ones that are already queued first and these ones
> > with the next batch. Feel free to rebase if necessary.
> 
> I've pulled it in and will send up with fixes tonight (Tony has OMAP
> fixes coming, others might too).
> 

Ok, thanks!

I just noticed that I was missing yet another one, which I now added
directly. It was part of a longer series I sent last week. I wasn't
really sure whether this one would better be included in arm-soc or
Russell's arm tree and then I ended up not putting it in either series :(

	Arnd

8<----------
>From bfbad32a63fa6287723961f07bcd043dc9c5965c Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 13:34:13 +0000
Subject: [PATCH] ARM: pxa: armcore: fix PCI PIO warnings

The it8152 PCI host used on the pxa/cm_x2xx machines
uses the old-style I/O window registration. This should
eventually get converted to pci_ioremap_io() but for
now, let's cast the IT8152_IO_BASE constant to an integer
type to get rid of the warnings.

Without this patch, building cm_x2xx_defconfig results in:

arch/arm/common/it8152.c: In function 'it8152_pci_setup':
arch/arm/common/it8152.c:287:18: warning: assignment makes integer from pointer without a cast [enabled by default]
arch/arm/common/it8152.c:288:16: warning: assignment makes integer from pointer without a cast [enabled by default]
arch/arm/common/it8152.c:291:17: warning: assignment makes integer from pointer without a cast [enabled by default]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>

diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index c4110d1..001f491 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -284,11 +284,17 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)
 
 int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)
 {
-	it8152_io.start = IT8152_IO_BASE + 0x12000;
-	it8152_io.end	= IT8152_IO_BASE + 0x12000 + 0x100000;
+	/*
+	 * FIXME: use pci_ioremap_io to remap the IO space here and
+	 * move over to the generic io.h implementation.
+	 * This requires solving the same problem for PXA PCMCIA
+	 * support.
+	 */
+	it8152_io.start = (unsigned long)IT8152_IO_BASE + 0x12000;
+	it8152_io.end	= (unsigned long)IT8152_IO_BASE + 0x12000 + 0x100000;
 
 	sys->mem_offset = 0x10000000;
-	sys->io_offset  = IT8152_IO_BASE;
+	sys->io_offset  = (unsigned long)IT8152_IO_BASE;
 
 	if (request_resource(&ioport_resource, &it8152_io)) {
 		printk(KERN_ERR "PCI: unable to allocate IO region\n");

[PATCH 0/3] new ARM-soc warning fixes

[Arnd Bergmann]

On Tuesday 09 October 2012, Olof Johansson wrote:
> On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
> > Hi Olof,
> > 
> > Here are three more fixes that I'd like to merge through the arm-soc
> > as time permits. All of them should be completely harmless and they
> > only fix harmless gcc warnings.
> > 
> > I don't know what your plans are for sending the next fixes branch.
> > I've uploaded these into a new "fixes2" branch on top of the patches
> > that are already in "fixes". We can either send them all together,
> > or you send the ones that are already queued first and these ones
> > with the next batch. Feel free to rebase if necessary.
> 
> I've pulled it in and will send up with fixes tonight (Tony has OMAP
> fixes coming, others might too).
> 

Ok, thanks!

I just noticed that I was missing yet another one, which I now added
directly. It was part of a longer series I sent last week. I wasn't
really sure whether this one would better be included in arm-soc or
Russell's arm tree and then I ended up not putting it in either series :(

	Arnd

8<----------
>From bfbad32a63fa6287723961f07bcd043dc9c5965c Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 13:34:13 +0000
Subject: [PATCH] ARM: pxa: armcore: fix PCI PIO warnings

The it8152 PCI host used on the pxa/cm_x2xx machines
uses the old-style I/O window registration. This should
eventually get converted to pci_ioremap_io() but for
now, let's cast the IT8152_IO_BASE constant to an integer
type to get rid of the warnings.

Without this patch, building cm_x2xx_defconfig results in:

arch/arm/common/it8152.c: In function 'it8152_pci_setup':
arch/arm/common/it8152.c:287:18: warning: assignment makes integer from pointer without a cast [enabled by default]
arch/arm/common/it8152.c:288:16: warning: assignment makes integer from pointer without a cast [enabled by default]
arch/arm/common/it8152.c:291:17: warning: assignment makes integer from pointer without a cast [enabled by default]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>

diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index c4110d1..001f491 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -284,11 +284,17 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)
 
 int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)
 {
-	it8152_io.start = IT8152_IO_BASE + 0x12000;
-	it8152_io.end	= IT8152_IO_BASE + 0x12000 + 0x100000;
+	/*
+	 * FIXME: use pci_ioremap_io to remap the IO space here and
+	 * move over to the generic io.h implementation.
+	 * This requires solving the same problem for PXA PCMCIA
+	 * support.
+	 */
+	it8152_io.start = (unsigned long)IT8152_IO_BASE + 0x12000;
+	it8152_io.end	= (unsigned long)IT8152_IO_BASE + 0x12000 + 0x100000;
 
 	sys->mem_offset = 0x10000000;
-	sys->io_offset  = IT8152_IO_BASE;
+	sys->io_offset  = (unsigned long)IT8152_IO_BASE;
 
 	if (request_resource(&ioport_resource, &it8152_io)) {
 		printk(KERN_ERR "PCI: unable to allocate IO region\n");

Re: [PATCH 0/3] new ARM-soc warning fixes

[Olof Johansson]

On Tue, Oct 09, 2012 at 08:01:26PM +0000, Arnd Bergmann wrote:
> On Tuesday 09 October 2012, Olof Johansson wrote:
> > On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
> > > Hi Olof,
> > > 
> > > Here are three more fixes that I'd like to merge through the arm-soc
> > > as time permits. All of them should be completely harmless and they
> > > only fix harmless gcc warnings.
> > > 
> > > I don't know what your plans are for sending the next fixes branch.
> > > I've uploaded these into a new "fixes2" branch on top of the patches
> > > that are already in "fixes". We can either send them all together,
> > > or you send the ones that are already queued first and these ones
> > > with the next batch. Feel free to rebase if necessary.
> > 
> > I've pulled it in and will send up with fixes tonight (Tony has OMAP
> > fixes coming, others might too).
> > 
> 
> Ok, thanks!
> 
> I just noticed that I was missing yet another one, which I now added
> directly. It was part of a longer series I sent last week. I wasn't
> really sure whether this one would better be included in arm-soc or
> Russell's arm tree and then I ended up not putting it in either series :(

OK, I applied on top of the rest.


-Olof

[PATCH 0/3] new ARM-soc warning fixes

[Olof Johansson]

On Tue, Oct 09, 2012 at 08:01:26PM +0000, Arnd Bergmann wrote:
> On Tuesday 09 October 2012, Olof Johansson wrote:
> > On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
> > > Hi Olof,
> > > 
> > > Here are three more fixes that I'd like to merge through the arm-soc
> > > as time permits. All of them should be completely harmless and they
> > > only fix harmless gcc warnings.
> > > 
> > > I don't know what your plans are for sending the next fixes branch.
> > > I've uploaded these into a new "fixes2" branch on top of the patches
> > > that are already in "fixes". We can either send them all together,
> > > or you send the ones that are already queued first and these ones
> > > with the next batch. Feel free to rebase if necessary.
> > 
> > I've pulled it in and will send up with fixes tonight (Tony has OMAP
> > fixes coming, others might too).
> > 
> 
> Ok, thanks!
> 
> I just noticed that I was missing yet another one, which I now added
> directly. It was part of a longer series I sent last week. I wasn't
> really sure whether this one would better be included in arm-soc or
> Russell's arm tree and then I ended up not putting it in either series :(

OK, I applied on top of the rest.


-Olof

Re: [PATCH 3/3] ARM: integrator: use __iomem pointers for MMIO, part 2

[Linus Walleij]

On Tue, Oct 9, 2012 at 5:34 PM, Arnd Bergmann <arnd@arndb.de> wrote:

> Due to some interesting merges in the integrator code, not
> all users of mmio pointers were converted before, this
> fixes all warnings that got introduced as a consequence.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>

Yeah I told you it was gonna collide ;-)

Thanks a lot for fixing it up and following through
on this!

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

[PATCH 3/3] ARM: integrator: use __iomem pointers for MMIO, part 2

[Linus Walleij]

On Tue, Oct 9, 2012 at 5:34 PM, Arnd Bergmann <arnd@arndb.de> wrote:

> Due to some interesting merges in the integrator code, not
> all users of mmio pointers were converted before, this
> fixes all warnings that got introduced as a consequence.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>

Yeah I told you it was gonna collide ;-)

Thanks a lot for fixing it up and following through
on this!

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij