* [PATCH] ARM: fix some trivial compiler warnings
2010-11-13 5:49 Jason Chagas
@ 2010-11-15 2:07 ` Eric Miao
0 siblings, 0 replies; 3+ messages in thread
From: Eric Miao @ 2010-11-15 2:07 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Nov 13, 2010 at 1:49 PM, Jason Chagas <jason.chagas@gmail.com> wrote:
>
> From acb6004dae483e61760714286a5e544c4a1d899c Mon Sep 17 00:00:00 2001
> From: Jason Chagas <jason.chagas@marvell.com>
> Date: Sat, 13 Nov 2010 00:01:44 -0500
> Subject: [PATCH] ARM: fix some trivial compiler warnings
>
> arch/arm/kernel/ptrace.c: In function 'get_branch_address':
> arch/arm/kernel/ptrace.c:429: warning: comparison between pointer and
> integer
> arch/arm/kernel/ptrace.c:429: warning: comparison between pointer and
> integer
>
> arch/arm/mach-mmp/mmp2.c:127: warning: 'clk_rtc' defined but not used
>
> drivers/i2c/busses/i2c-pxa.c: In function 'i2c_pxa_probe':
> drivers/i2c/busses/i2c-pxa.c:1004: warning: initialization discards
> qualifiers from pointer target type
>
> Signed-off-by: Jason Chagas <jason.chagas@marvell.com>
> ---
> ?arch/arm/kernel/ptrace.c ? ? | ? ?2 +-
> ?arch/arm/mach-mmp/mmp2.c ? ? | ? ?1 -
> ?drivers/i2c/busses/i2c-pxa.c | ? ?2 +-
> ?3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
> index cf16bca..7bb9a88 100644
> --- a/arch/arm/kernel/ptrace.c
> +++ b/arch/arm/kernel/ptrace.c
> @@ -426,7 +426,7 @@ get_branch_address(struct task_struct *child,
> unsigned long pc, unsigned long in
> ? ? ? ? ? ?break;
> ? ? ? ?}
>
> - ? ? ? if (alt >= (void*)CONFIG_VECTORS_BASE && alt <
> (void*)CONFIG_VECTORS_BASE + PAGE_SIZE)
> + ? ? ? if (alt >= CONFIG_VECTORS_BASE && alt < CONFIG_VECTORS_BASE +
> PAGE_SIZE)
> ? ? ? ? ? ? ? ?alt = get_user_reg(child, REG_LR);
>
> ? ? ? ?return alt;
> diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
> index 7f5eb05..3028bb7 100644
> --- a/arch/arm/mach-mmp/mmp2.c
> +++ b/arch/arm/mach-mmp/mmp2.c
> @@ -124,7 +124,6 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000);
> ?static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);
> ?static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);
> ?static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);
> -static APBC_CLK(rtc, MMP2_RTC, 0, 32768);
>
> ?static APMU_CLK(nand, NAND, 0xbf, 100000000);
>
Jason,
I've separated this into an individual patch with comment as follows:
commit f1064ce43b6c4e6aa4d122600db2e952c79bec91
Author: Jason Chagas <jason.chagas@marvell.com>
Date: Mon Nov 15 09:50:12 2010 +0800
ARM: mmp2: remove not used clk_rtc
RTC clock will remain at 32KHz and powered on, there is no need for it
at this moment.
Signed-off-by: Jason Chagas <jason.chagas@marvell.com>
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index daf3993..2e3dd08 100644
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -126,7 +126,6 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000);
static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);
static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);
static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);
-static APBC_CLK(rtc, MMP2_RTC, 0, 32768);
static APMU_CLK(nand, NAND, 0xbf, 100000000);
> diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
> index 020ff23..c94e51b 100644
> --- a/drivers/i2c/busses/i2c-pxa.c
> +++ b/drivers/i2c/busses/i2c-pxa.c
> @@ -1001,7 +1001,7 @@ static int i2c_pxa_probe(struct platform_device
> *dev)
> ? ? ? ?struct pxa_i2c *i2c;
> ? ? ? ?struct resource *res;
> ? ? ? ?struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
> - ? ? ? struct platform_device_id *id = platform_get_device_id(dev);
> + ? ? ? const struct platform_device_id *id = platform_get_device_id(dev);
> ? ? ? ?int ret;
> ? ? ? ?int irq;
>
This has been fixed in the latest tree by the commit below:
commit 21e2ecfe19df8f28408b5a607fef8704f51fa7f8
Author: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue Jun 15 10:56:45 2010 +0200
i2c-pxa: fix compiler warning, due to missing const
This patch adds the missing const to "struct platform_device_id" to fix
this warning:
/home/frogger/pengutronix/linux/linux-2.6/drivers/i2c/busses/i2c-pxa.c:
In function 'i2c_pxa_probe':
/home/frogger/pengutronix/linux/linux-2.6/drivers/i2c/busses/i2c-pxa.c:1004:
warning: initialization discards qualifiers from pointer target type
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Roel Kluin <roel.kluin@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 020ff23..c94e51b 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1001,7 +1001,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
struct pxa_i2c *i2c;
struct resource *res;
struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
- struct platform_device_id *id = platform_get_device_id(dev);
+ const struct platform_device_id *id = platform_get_device_id(dev);
int ret;
int irq;
^ permalink raw reply related [flat|nested] 3+ messages in thread