Russell,
do you prefer me pushing these patches upstream (possibly even for -rc3), or
do you wish to take these patches?
Best,
Dominik
On Wed, Mar 24, 2010 at 08:45:10PM -0300, Marcelo Roberto Jimenez wrote:
This patch fixes checkpatch.pl issues in soc_common.c.
Signed-off-by: Marcelo Roberto Jimenez mrobe...@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,
SOC_PCMCIA_3V_MEM_ACCESS);
+ 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, SOC_PCMCIA_3V_MEM_ACCESS);
}
EXPORT_SYMBOL(soc_common_pcmcia_get_timing);
@@ -132,8 +137,8 @@ static unsigned int soc_common_pcmcia_skt_state(struct
soc_pcmcia_socket *skt)
*
* Convert PCMCIA socket state to our socket configure structure.
*/
-static int
-soc_common_pcmcia_config_skt(struct soc_pcmcia_socket *skt, socket_state_t
*state)
+static int soc_common_pcmcia_config_skt(
+ struct soc_pcmcia_socket *skt, socket_state_t *state)
{
int ret;
@@ -145,7 +150,8 @@ soc_common_pcmcia_config_skt(struct soc_pcmcia_socket
*skt, socket_state_t *stat
*/
if (skt-irq_state != 1 state-io_irq) {
skt-irq_state = 1;
- set_irq_type(skt-socket.pci_irq,
IRQ_TYPE_EDGE_FALLING);
+ set_irq_type(skt-socket.pci_irq,
+ IRQ_TYPE_EDGE_FALLING);
} else if (skt-irq_state == 1 state-io_irq == 0) {
skt-irq_state = 0;
set_irq_type(skt-socket.pci_irq, IRQ_TYPE_NONE);
@@ -299,24 +305,24 @@ soc_common_pcmcia_get_status(struct pcmcia_socket
*sock, unsigned int *status)
* of power configuration, reset, c. We also record the value of
* `state' in order to regurgitate it to the PCMCIA core later.
*/
-static int
-soc_common_pcmcia_set_socket(struct pcmcia_socket *sock, socket_state_t
*state)
+static int soc_common_pcmcia_set_socket(
+ struct pcmcia_socket *sock, socket_state_t *state)
{
struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
- debug(skt, 2, mask: %s%s%s%s%s%sflags: %s%s%s%s%s%sVcc %d Vpp %d irq
%d\n,
- (state-csc_mask==0)?NONE :,
- (state-csc_maskSS_DETECT)?DETECT :,
- (state-csc_maskSS_READY)?READY :,
- (state-csc_maskSS_BATDEAD)?BATDEAD :,
- (state-csc_maskSS_BATWARN)?BATWARN :,
- (state-csc_maskSS_STSCHG)?STSCHG :,
- (state-flags==0)?NONE :,
- (state-flagsSS_PWR_AUTO)?PWR_AUTO :,
- (state-flagsSS_IOCARD)?IOCARD :,
- (state-flagsSS_RESET)?RESET :,
- (state-flagsSS_SPKR_ENA)?SPKR_ENA :,
- (state-flagsSS_OUTPUT_ENA)?OUTPUT_ENA :,
+ debug(skt, 2, mask: %s%s%s%s%s%s flags: %s%s%s%s%s%s Vcc %d Vpp %d irq
%d\n,
+