Home » Mailing list archives » linux-kernel » 2010 » March » 24

[PATCH 1/2] ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module.

Previous thread: [PATCH 1/1] staging;rar_register: add TODO file by mark.a.allyn on Wednesday, March 24, 2010 - 3:54 pm. (2 messages)

Next thread: [PATCH] Expose the statistics in blkio.time and blkio.sectors for the root cgroup by Ricky Benitez on Wednesday, March 24, 2010 - 4:35 pm. (4 messages)
[view original message]
From: Marcelo Roberto Jimenez
Subject: [PATCH 1/2] ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module.
Date: Wednesday, March 24, 2010 - 4:04 pm

This patch fixes a compilation issue when compiling PCMCIA SA1100
support as a module with PCMCIA_DEBUG enabled. The symbol
soc_pcmcia_debug was not beeing exported.

Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
---
 drivers/pcmcia/soc_common.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 6f1a86b..fd4c25a 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -65,6 +65,7 @@ void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func,
 		va_end(args);
 	}
 }
+EXPORT_SYMBOL(soc_pcmcia_debug);
 
 #endif
 
-- 
1.7.0.3

--


[ message continues ]
[view original message]
From: Marcelo Roberto Jimenez
Subject: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Wednesday, March 24, 2010 - 4:04 pm

This patch fixes checkpatch.pl issues in soc_common.c.

Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
---
 drivers/pcmcia/soc_common.c |  129 +++++++++++++++++++++++--------------------
 1 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index fd4c25a..22af8d2 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -31,20 +31,20 @@
 ======================================================================*/
 
 
-#include <linux/module.h>
-#include <linux/moduleparam.h>
+#include <linux/cpufreq.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
-#include <linux/timer.h>
 #include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
 #include <linux/spinlock.h>
-#include <linux/cpufreq.h>
+#include <linux/timer.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/system.h>
 
 #include "soc_common.h"
@@ -69,7 +69,8 @@ EXPORT_SYMBOL(soc_pcmcia_debug);
 
 #endif
 
-#define to_soc_pcmcia_socket(x)	container_of(x, struct soc_pcmcia_socket, socket)
+#define to_soc_pcmcia_socket(x)	\
+	container_of(x, struct soc_pcmcia_socket, socket)
 
 static unsigned short
 calc_speed(unsigned short *spds, int num, unsigned short dflt)
@@ -86,11 +87,15 @@ calc_speed(unsigned short *spds, int num, unsigned short dflt)
 	return speed;
 }
 
-void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt, struct soc_pcmcia_timing *timing)
+void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt,
+	struct soc_pcmcia_timing *timing)
 {
-	timing->io = calc_speed(skt->spd_io, MAX_IO_WIN, SOC_PCMCIA_IO_ACCESS);
-	timing->mem = calc_speed(skt->spd_mem, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
-	timing->attr = calc_speed(skt->spd_attr, MAX_WIN, ...
[ message continues ]
[view original message]
From: Russell King - ARM Linux
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Wednesday, March 24, 2010 - 4:07 pm

NAK.  Breaking kernel messages across multiple lines makes them impossible
to grep for.  checkpatch.pl is wrong on this one.
--


[ message continues ]
[view original message]
From: Marcelo Jimenez
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Wednesday, March 24, 2010 - 4:20 pm

On Wed, Mar 24, 2010 at 20:07, Russell King - ARM Linux

I will redo it, no problem. But just for my information, in that
particular case, is it usefull to grep using format specifiers?
--


[ message continues ]
[view original message]
From: Valdis.Kletnieks
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Friday, March 26, 2010 - 8:56 am

Until you find the format string, you really don't know for sure if
it's a %d or a %u or a %alt-ctl-cokebottle so you end up grepping like this:

egrep 'mask: .*flags: .*Vcc .* Vpp .* irq'

basically wildcarding your way across whatever %foo might be there.

[ message continues ]
[view original message]
From: Sergei Shtylyov
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Thursday, March 25, 2010 - 3:19 am

Hello.


   I'd disagree in this case. Anybody will hardly grep for "mask: 
%s%s%s%s%s%sflags: %s%s%s%s%s%s".

WBR, Sergei

--


[ message continues ]
[view original message]
From: Valdis.Kletnieks
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Thursday, March 25, 2010 - 11:26 am

However,  egrep 'mask: .*flags: ' is quite plausible.

[ message continues ]
[view original message]
From: Russell King - ARM Linux
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Friday, March 26, 2010 - 11:18 am

Well, I disagree on a matter of principle with you.  If you want to avoid
the line going over 80 columns, move the entire string onto the next line.
Then we can have the entire string intact _and_ we can have it fitting
within 80 columns.
--


[ message continues ]
[view original message]
From: Marcelo Jimenez
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Friday, March 26, 2010 - 2:57 pm

On Fri, Mar 26, 2010 at 15:18, Russell King - ARM Linux

This is no big deal. Also, I have already submitted the new patch and
Valdis had a good point for egrep.

Regards,
Marcelo.
--


[ message continues ]
[view original message]
From: Russell King - ARM Linux
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Friday, March 26, 2010 - 4:06 pm

Sorry, I'm having stability issues with my MTA which inexplicably died
about 12 hours ago, presumably due to the level of crap flying around
the 'net nowadays.  This appears to be becoming a regular occurance in
the last week. ;(
--


[ message continues ]
[view original message]
From: Marcelo Roberto Jimenez
Subject: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Wednesday, March 24, 2010 - 4:45 pm

This patch fixes checkpatch.pl issues in soc_common.c.

Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
---
 drivers/pcmcia/soc_common.c |  128 +++++++++++++++++++++++--------------------
 1 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index fd4c25a..25c5b50 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -31,20 +31,20 @@
 ======================================================================*/
 
 
-#include <linux/module.h>
-#include <linux/moduleparam.h>
+#include <linux/cpufreq.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
-#include <linux/timer.h>
 #include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
 #include <linux/spinlock.h>
-#include <linux/cpufreq.h>
+#include <linux/timer.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/system.h>
 
 #include "soc_common.h"
@@ -69,7 +69,8 @@ EXPORT_SYMBOL(soc_pcmcia_debug);
 
 #endif
 
-#define to_soc_pcmcia_socket(x)	container_of(x, struct soc_pcmcia_socket, socket)
+#define to_soc_pcmcia_socket(x)	\
+	container_of(x, struct soc_pcmcia_socket, socket)
 
 static unsigned short
 calc_speed(unsigned short *spds, int num, unsigned short dflt)
@@ -86,11 +87,15 @@ calc_speed(unsigned short *spds, int num, unsigned short dflt)
 	return speed;
 }
 
-void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt, struct soc_pcmcia_timing *timing)
+void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt,
+	struct soc_pcmcia_timing *timing)
 {
-	timing->io = calc_speed(skt->spd_io, MAX_IO_WIN, SOC_PCMCIA_IO_ACCESS);
-	timing->mem = calc_speed(skt->spd_mem, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
-	timing->attr = calc_speed(skt->spd_attr, MAX_WIN, ...
[ message continues ]
[view original message]
From: Dominik Brodowski
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Thursday, March 25, 2010 - 10:04 am

Russell,

do you prefer me pushing these patches upstream (possibly even for -rc3), or
do you wish to take these patches?

Best,
	Dominik

--


[ message continues ]
[view original message]
From: Marcelo Jimenez
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Thursday, March 25, 2010 - 10:47 am

On Thu, Mar 25, 2010 at 14:04, Dominik Brodowski

If possible, please take a look at my other ARM patches, I have
submitted a total of nine, but got feedback in only two of them (this

Regards,
Marcelo.
--


[ message continues ]
[view original message]
From: Russell King - ARM Linux
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Sunday, March 28, 2010 - 2:44 am

I'll take them through the patch system, but as they're not bug fixes
I'd queue them for the next merge window.
--


[ message continues ]
[view original message]
From: Dominik Brodowski
Subject: Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c
Date: Sunday, March 28, 2010 - 2:46 am

Excellent, thanks a lot.

Best,
	Dominik
--


[ message continues ]
Previous thread: [PATCH 1/1] staging;rar_register: add TODO file by mark.a.allyn on Wednesday, March 24, 2010 - 3:54 pm. (2 messages)

Next thread: [PATCH] Expose the statistics in blkio.time and blkio.sectors for the root cgroup by Ricky Benitez on Wednesday, March 24, 2010 - 4:35 pm. (4 messages)