* [PATCH] ARM: pxa/raumfeld: fix button name
@ 2010-03-18 18:37 Daniel Mack
2010-03-22 4:02 ` Eric Miao
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Mack @ 2010-03-18 18:37 UTC (permalink / raw)
To: linux-arm-kernel
This fixes a warning when booting 2.6.34-rc2:
[ 26.619814] ------------[ cut here ]------------
[ 26.624604] WARNING: at fs/proc/generic.c:316 __xlate_proc_name+0xac/0xc0()
[ 26.631555] name 'on/off button'
[ 26.634753] Modules linked in:
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Eric Miao <eric.miao@marvell.com>
Cc: Sven Neumann <s.neumann@raumfeld.com>
---
arch/arm/mach-pxa/raumfeld.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index 3184bdc..9bf86b6 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -444,7 +444,7 @@ static struct gpio_keys_button gpio_keys_button[] = {
.active_low = 0,
.wakeup = 0,
.debounce_interval = 5, /* ms */
- .desc = "on/off button",
+ .desc = "on_off button",
},
};
--
1.6.6.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa/raumfeld: fix button name
2010-03-18 18:37 Daniel Mack
@ 2010-03-22 4:02 ` Eric Miao
0 siblings, 0 replies; 7+ messages in thread
From: Eric Miao @ 2010-03-22 4:02 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Mar 19, 2010 at 2:37 AM, Daniel Mack <daniel@caiaq.de> wrote:
> This fixes a warning when booting 2.6.34-rc2:
>
> [ ? 26.619814] ------------[ cut here ]------------
> [ ? 26.624604] WARNING: at fs/proc/generic.c:316 __xlate_proc_name+0xac/0xc0()
> [ ? 26.631555] name 'on/off button'
> [ ? 26.634753] Modules linked in:
>
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Eric Miao <eric.miao@marvell.com>
> Cc: Sven Neumann <s.neumann@raumfeld.com>
> ---
Applied to 'fix'.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa/raumfeld: fix button name
@ 2010-04-18 7:35 Daniel Mack
2010-04-22 10:19 ` Daniel Mack
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Mack @ 2010-04-18 7:35 UTC (permalink / raw)
To: linux-arm-kernel
"on/off button" was recently renamed to remove the slash character.
Follow that change in the pin polarity detection as well.
While at it, fix another cosmetic coding style flaw as well.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Eric Miao <eric.y.miao@gmail.com>
---
arch/arm/mach-pxa/raumfeld.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index 3bbc2d8..7582a12 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -1001,7 +1001,7 @@ static void __init raumfeld_common_init(void)
int i;
for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++)
- if (!strcmp(gpio_keys_button[i].desc, "on/off button"))
+ if (!strcmp(gpio_keys_button[i].desc, "on_off button"))
gpio_keys_button[i].active_low = 1;
}
@@ -1027,8 +1027,7 @@ static void __init raumfeld_common_init(void)
gpio_direction_output(GPIO_W2W_PDN, 0);
/* this can be used to switch off the device */
- ret = gpio_request(GPIO_SHUTDOWN_SUPPLY,
- "supply shutdown");
+ ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
if (ret < 0)
pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
else
--
1.7.0.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa/raumfeld: fix button name
2010-04-18 7:35 [PATCH] ARM: pxa/raumfeld: fix button name Daniel Mack
@ 2010-04-22 10:19 ` Daniel Mack
2010-04-26 21:03 ` Daniel Mack
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Mack @ 2010-04-22 10:19 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Apr 18, 2010 at 09:35:29AM +0200, Daniel Mack wrote:
> "on/off button" was recently renamed to remove the slash character.
> Follow that change in the pin polarity detection as well.
>
> While at it, fix another cosmetic coding style flaw as well.
>
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Eric Miao <eric.y.miao@gmail.com>
Eric, can you apply this? Would be nice to have it in .34, but not
totally mandatory.
Thanks,
Daniel
> ---
> arch/arm/mach-pxa/raumfeld.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
> index 3bbc2d8..7582a12 100644
> --- a/arch/arm/mach-pxa/raumfeld.c
> +++ b/arch/arm/mach-pxa/raumfeld.c
> @@ -1001,7 +1001,7 @@ static void __init raumfeld_common_init(void)
> int i;
>
> for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++)
> - if (!strcmp(gpio_keys_button[i].desc, "on/off button"))
> + if (!strcmp(gpio_keys_button[i].desc, "on_off button"))
> gpio_keys_button[i].active_low = 1;
> }
>
> @@ -1027,8 +1027,7 @@ static void __init raumfeld_common_init(void)
> gpio_direction_output(GPIO_W2W_PDN, 0);
>
> /* this can be used to switch off the device */
> - ret = gpio_request(GPIO_SHUTDOWN_SUPPLY,
> - "supply shutdown");
> + ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
> if (ret < 0)
> pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
> else
> --
> 1.7.0.3
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa/raumfeld: fix button name
2010-04-22 10:19 ` Daniel Mack
@ 2010-04-26 21:03 ` Daniel Mack
2010-04-27 2:37 ` Eric Miao
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Mack @ 2010-04-26 21:03 UTC (permalink / raw)
To: linux-arm-kernel
Ping?
On Thu, Apr 22, 2010 at 12:19:56PM +0200, Daniel Mack wrote:
> On Sun, Apr 18, 2010 at 09:35:29AM +0200, Daniel Mack wrote:
> > "on/off button" was recently renamed to remove the slash character.
> > Follow that change in the pin polarity detection as well.
> >
> > While at it, fix another cosmetic coding style flaw as well.
> >
> > Signed-off-by: Daniel Mack <daniel@caiaq.de>
> > Cc: Eric Miao <eric.y.miao@gmail.com>
>
> Eric, can you apply this? Would be nice to have it in .34, but not
> totally mandatory.
>
> Thanks,
> Daniel
>
>
> > ---
> > arch/arm/mach-pxa/raumfeld.c | 5 ++---
> > 1 files changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
> > index 3bbc2d8..7582a12 100644
> > --- a/arch/arm/mach-pxa/raumfeld.c
> > +++ b/arch/arm/mach-pxa/raumfeld.c
> > @@ -1001,7 +1001,7 @@ static void __init raumfeld_common_init(void)
> > int i;
> >
> > for (i = 0; i < ARRAY_SIZE(gpio_keys_button); i++)
> > - if (!strcmp(gpio_keys_button[i].desc, "on/off button"))
> > + if (!strcmp(gpio_keys_button[i].desc, "on_off button"))
> > gpio_keys_button[i].active_low = 1;
> > }
> >
> > @@ -1027,8 +1027,7 @@ static void __init raumfeld_common_init(void)
> > gpio_direction_output(GPIO_W2W_PDN, 0);
> >
> > /* this can be used to switch off the device */
> > - ret = gpio_request(GPIO_SHUTDOWN_SUPPLY,
> > - "supply shutdown");
> > + ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
> > if (ret < 0)
> > pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
> > else
> > --
> > 1.7.0.3
> >
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa/raumfeld: fix button name
2010-04-26 21:03 ` Daniel Mack
@ 2010-04-27 2:37 ` Eric Miao
2010-04-27 4:15 ` Daniel Mack
0 siblings, 1 reply; 7+ messages in thread
From: Eric Miao @ 2010-04-27 2:37 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Apr 27, 2010 at 5:03 AM, Daniel Mack <daniel@caiaq.de> wrote:
> Ping?
>
Mind if I put it to the queue of the next merge window?
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: pxa/raumfeld: fix button name
2010-04-27 2:37 ` Eric Miao
@ 2010-04-27 4:15 ` Daniel Mack
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Mack @ 2010-04-27 4:15 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Apr 27, 2010 at 10:37:02AM +0800, Eric Miao wrote:
> On Tue, Apr 27, 2010 at 5:03 AM, Daniel Mack <daniel@caiaq.de> wrote:
> > Ping?
> >
>
> Mind if I put it to the queue of the next merge window?
No problem. Thanks!
Daniel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-04-27 4:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-18 7:35 [PATCH] ARM: pxa/raumfeld: fix button name Daniel Mack
2010-04-22 10:19 ` Daniel Mack
2010-04-26 21:03 ` Daniel Mack
2010-04-27 2:37 ` Eric Miao
2010-04-27 4:15 ` Daniel Mack
-- strict thread matches above, loose matches on Subject: below --
2010-03-18 18:37 Daniel Mack
2010-03-22 4:02 ` Eric Miao
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).