ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c.

This patch fixes checkpatch.pl issues in drivers/pcmcia/soc_common.c. Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c.
This patch fixes checkpatch.pl issues in drivers/pcmcia/soc_common.c. Signed-off-by: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Marcelo Roberto Jimenez · Russell King
1 parent d2ccb52d88
Showing 1 changed file with 68 additions and 60 deletions Side-by-side Diff
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"
@@ -68,7 +68,8 @@
  
 #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)
  
@@ -85,11 +86,15 @@
 	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);
  
@@ -131,8 +136,8 @@
  *
  * 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;
  
@@ -144,7 +149,8 @@
 		 */
 		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);
  
@@ -298,24 +304,24 @@
  * 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_mask&SS_DETECT)?"DETECT ":"",
-			(state->csc_mask&SS_READY)?"READY ":"",
-			(state->csc_mask&SS_BATDEAD)?"BATDEAD ":"",
-			(state->csc_mask&SS_BATWARN)?"BATWARN ":"",
-			(state->csc_mask&SS_STSCHG)?"STSCHG ":"",
-			(state->flags==0)?"<NONE> ":"",
-			(state->flags&SS_PWR_AUTO)?"PWR_AUTO ":"",
-			(state->flags&SS_IOCARD)?"IOCARD ":"",
-			(state->flags&SS_RESET)?"RESET ":"",
-			(state->flags&SS_SPKR_ENA)?"SPKR_ENA ":"",
-			(state->flags&SS_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",
+			(state->csc_mask == 0)		? "<NONE> " :	"",
+			(state->csc_mask & SS_DETECT)	? "DETECT " :	"",
+			(state->csc_mask & SS_READY)	? "READY " :	"",
+			(state->csc_mask & SS_BATDEAD)	? "BATDEAD " :	"",
+			(state->csc_mask & SS_BATWARN)	? "BATWARN " :	"",
+			(state->csc_mask & SS_STSCHG)	? "STSCHG " :	"",
+			(state->flags == 0)		? "<NONE> " :	"",
+			(state->flags & SS_PWR_AUTO)	? "PWR_AUTO " :	"",
+			(state->flags & SS_IOCARD)	? "IOCARD " :	"",
+			(state->flags & SS_RESET)	? "RESET " :	"",
+			(state->flags & SS_SPKR_ENA)	? "SPKR_ENA " :	"",
+			(state->flags & SS_OUTPUT_ENA)	? "OUTPUT_ENA " : "",
 			state->Vcc, state->Vpp, state->io_irq);
  
 	return soc_common_pcmcia_config_skt(skt, state);
@@ -330,8 +336,8 @@
  *
  * Returns: 0 on success, -1 on error
  */
-static int
-soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *map)
+static int soc_common_pcmcia_set_io_map(
+	struct pcmcia_socket *sock, struct pccard_io_map *map)
 {
 	struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
 	unsigned short speed = map->speed;
@@ -340,14 +346,14 @@
 		map->map, map->speed, (unsigned long long)map->start,
 		(unsigned long long)map->stop);
 	debug(skt, 2, "flags: %s%s%s%s%s%s%s%s\n",
-		(map->flags==0)?"<NONE>":"",
-		(map->flags&MAP_ACTIVE)?"ACTIVE ":"",
-		(map->flags&MAP_16BIT)?"16BIT ":"",
-		(map->flags&MAP_AUTOSZ)?"AUTOSZ ":"",
-		(map->flags&MAP_0WS)?"0WS ":"",
-		(map->flags&MAP_WRPROT)?"WRPROT ":"",
-		(map->flags&MAP_USE_WAIT)?"USE_WAIT ":"",
-		(map->flags&MAP_PREFETCH)?"PREFETCH ":"");
+		(map->flags == 0)		? "<NONE>"	: "",
+		(map->flags & MAP_ACTIVE)	? "ACTIVE "	: "",
+		(map->flags & MAP_16BIT)	? "16BIT "	: "",
+		(map->flags & MAP_AUTOSZ)	? "AUTOSZ "	: "",
+		(map->flags & MAP_0WS)		? "0WS "	: "",
+		(map->flags & MAP_WRPROT)	? "WRPROT "	: "",
+		(map->flags & MAP_USE_WAIT)	? "USE_WAIT "	: "",
+		(map->flags & MAP_PREFETCH)	? "PREFETCH "	: "");
  
 	if (map->map >= MAX_IO_WIN) {
 		printk(KERN_ERR "%s(): map (%d) out of range\n", __func__,
@@ -384,8 +390,8 @@
  *
  * Returns: 0 on success, -ERRNO on error
  */
-static int
-soc_common_pcmcia_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *map)
+static int soc_common_pcmcia_set_mem_map(
+	struct pcmcia_socket *sock, struct pccard_mem_map *map)
 {
 	struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
 	struct resource *res;
@@ -394,14 +400,14 @@
 	debug(skt, 2, "map %u speed %u card_start %08x\n",
 		map->map, map->speed, map->card_start);
 	debug(skt, 2, "flags: %s%s%s%s%s%s%s%s\n",
-		(map->flags==0)?"<NONE>":"",
-		(map->flags&MAP_ACTIVE)?"ACTIVE ":"",
-		(map->flags&MAP_16BIT)?"16BIT ":"",
-		(map->flags&MAP_AUTOSZ)?"AUTOSZ ":"",
-		(map->flags&MAP_0WS)?"0WS ":"",
-		(map->flags&MAP_WRPROT)?"WRPROT ":"",
-		(map->flags&MAP_ATTRIB)?"ATTRIB ":"",
-		(map->flags&MAP_USE_WAIT)?"USE_WAIT ":"");
+		(map->flags == 0)		? "<NONE>"	: "",
+		(map->flags & MAP_ACTIVE)	? "ACTIVE "	: "",
+		(map->flags & MAP_16BIT)	? "16BIT "	: "",
+		(map->flags & MAP_AUTOSZ)	? "AUTOSZ "	: "",
+		(map->flags & MAP_0WS)		? "0WS "	: "",
+		(map->flags & MAP_WRPROT)	? "WRPROT "	: "",
+		(map->flags & MAP_ATTRIB)	? "ATTRIB "	: "",
+		(map->flags & MAP_USE_WAIT)	? "USE_WAIT "	: "");
  
 	if (map->map >= MAX_WIN)
 		return -EINVAL;
@@ -456,8 +462,8 @@
 	{ SS_OUTPUT_ENA,	"SS_OUTPUT_ENA"	},
 };
  
-static void
-dump_bits(char **p, const char *prefix, unsigned int val, struct bittbl *bits, int sz)
+static void dump_bits(char **p, const char *prefix,
+	unsigned int val, struct bittbl *bits, int sz)
 {
 	char *b = *p;
 	int i;
  
@@ -475,13 +481,14 @@
  *
  * Returns: the number of characters added to the buffer
  */
-static ssize_t show_status(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_status(
+	struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct soc_pcmcia_socket *skt =
 		container_of(dev, struct soc_pcmcia_socket, socket.dev);
 	char *p = buf;
  
-	p+=sprintf(p, "slot     : %d\n", skt->nr);
+	p += sprintf(p, "slot     : %d\n", skt->nr);
  
 	dump_bits(&p, "status", skt->status,
 		  status_bits, ARRAY_SIZE(status_bits));
  
@@ -490,12 +497,12 @@
 	dump_bits(&p, "cs_flags", skt->cs_state.flags,
 		  conf_bits, ARRAY_SIZE(conf_bits));
  
-	p+=sprintf(p, "Vcc      : %d\n", skt->cs_state.Vcc);
-	p+=sprintf(p, "Vpp      : %d\n", skt->cs_state.Vpp);
-	p+=sprintf(p, "IRQ      : %d (%d)\n", skt->cs_state.io_irq,
+	p += sprintf(p, "Vcc      : %d\n", skt->cs_state.Vcc);
+	p += sprintf(p, "Vpp      : %d\n", skt->cs_state.Vpp);
+	p += sprintf(p, "IRQ      : %d (%d)\n", skt->cs_state.io_irq,
 		skt->socket.pci_irq);
 	if (skt->ops->show_timing)
-		p+=skt->ops->show_timing(skt, p);
+		p += skt->ops->show_timing(skt, p);
  
 	return p-buf;
 }
@@ -588,7 +595,7 @@
  
 	mutex_lock(&soc_pcmcia_sockets_lock);
 	list_for_each_entry(skt, &soc_pcmcia_sockets, node)
-		if ( skt->ops->frequency_change )
+		if (skt->ops->frequency_change)
 			ret += skt->ops->frequency_change(skt, val, freqs);
 	mutex_unlock(&soc_pcmcia_sockets_lock);
  
@@ -614,7 +621,8 @@
  
 static void soc_pcmcia_cpufreq_unregister(void)
 {
-	cpufreq_unregister_notifier(&soc_pcmcia_notifier_block, CPUFREQ_TRANSITION_NOTIFIER);
+	cpufreq_unregister_notifier(&soc_pcmcia_notifier_block,
+		CPUFREQ_TRANSITION_NOTIFIER);
 }
 module_exit(soc_pcmcia_cpufreq_unregister);
...	...	@@ -31,20 +31,20 @@
31	31	======================================================================*/
32	32
33	33
34		-#include <linux/module.h>
35		-#include <linux/moduleparam.h>
	34	+#include <linux/cpufreq.h>
36	35	#include <linux/init.h>
	36	+#include <linux/interrupt.h>
	37	+#include <linux/io.h>
	38	+#include <linux/irq.h>
37	39	#include <linux/kernel.h>
38		-#include <linux/timer.h>
39	40	#include <linux/mm.h>
	41	+#include <linux/module.h>
	42	+#include <linux/moduleparam.h>
40	43	#include <linux/mutex.h>
41		-#include <linux/interrupt.h>
42		-#include <linux/irq.h>
43	44	#include <linux/spinlock.h>
44		-#include <linux/cpufreq.h>
	45	+#include <linux/timer.h>
45	46
46	47	#include <mach/hardware.h>
47		-#include <asm/io.h>
48	48	#include <asm/system.h>
49	49
50	50	#include "soc_common.h"
...	...	@@ -68,7 +68,8 @@
68	68
69	69	#endif
70	70
71		-#define to_soc_pcmcia_socket(x) container_of(x, struct soc_pcmcia_socket, socket)
	71	+#define to_soc_pcmcia_socket(x) \
	72	+ container_of(x, struct soc_pcmcia_socket, socket)
72	73
73	74	static unsigned short
74	75	calc_speed(unsigned short *spds, int num, unsigned short dflt)
75	76
...	...	@@ -85,11 +86,15 @@
85	86	return speed;
86	87	}
87	88
88		-void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket skt, struct soc_pcmcia_timing timing)
	89	+void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *skt,
	90	+ struct soc_pcmcia_timing *timing)
89	91	{
90		- timing->io = calc_speed(skt->spd_io, MAX_IO_WIN, SOC_PCMCIA_IO_ACCESS);
91		- timing->mem = calc_speed(skt->spd_mem, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
92		- timing->attr = calc_speed(skt->spd_attr, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
	92	+ timing->io =
	93	+ calc_speed(skt->spd_io, MAX_IO_WIN, SOC_PCMCIA_IO_ACCESS);
	94	+ timing->mem =
	95	+ calc_speed(skt->spd_mem, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
	96	+ timing->attr =
	97	+ calc_speed(skt->spd_attr, MAX_WIN, SOC_PCMCIA_3V_MEM_ACCESS);
93	98	}
94	99	EXPORT_SYMBOL(soc_common_pcmcia_get_timing);
95	100
...	...	@@ -131,8 +136,8 @@
131	136	*
132	137	* Convert PCMCIA socket state to our socket configure structure.
133	138	*/
134		-static int
135		-soc_common_pcmcia_config_skt(struct soc_pcmcia_socket skt, socket_state_t state)
	139	+static int soc_common_pcmcia_config_skt(
	140	+ struct soc_pcmcia_socket skt, socket_state_t state)
136	141	{
137	142	int ret;
138	143
...	...	@@ -144,7 +149,8 @@
144	149	*/
145	150	if (skt->irq_state != 1 && state->io_irq) {
146	151	skt->irq_state = 1;
147		- set_irq_type(skt->socket.pci_irq, IRQ_TYPE_EDGE_FALLING);
	152	+ set_irq_type(skt->socket.pci_irq,
	153	+ IRQ_TYPE_EDGE_FALLING);
148	154	} else if (skt->irq_state == 1 && state->io_irq == 0) {
149	155	skt->irq_state = 0;
150	156	set_irq_type(skt->socket.pci_irq, IRQ_TYPE_NONE);
151	157
...	...	@@ -298,24 +304,24 @@
298	304	* of power configuration, reset, &c. We also record the value of
299	305	* `state' in order to regurgitate it to the PCMCIA core later.
300	306	*/
301		-static int
302		-soc_common_pcmcia_set_socket(struct pcmcia_socket sock, socket_state_t state)
	307	+static int soc_common_pcmcia_set_socket(
	308	+ struct pcmcia_socket sock, socket_state_t state)
303	309	{
304	310	struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
305	311
306		- debug(skt, 2, "mask: %s%s%s%s%s%sflags: %s%s%s%s%s%sVcc %d Vpp %d irq %d\n",
307		- (state->csc_mask==0)?"<NONE> ":"",
308		- (state->csc_mask&SS_DETECT)?"DETECT ":"",
309		- (state->csc_mask&SS_READY)?"READY ":"",
310		- (state->csc_mask&SS_BATDEAD)?"BATDEAD ":"",
311		- (state->csc_mask&SS_BATWARN)?"BATWARN ":"",
312		- (state->csc_mask&SS_STSCHG)?"STSCHG ":"",
313		- (state->flags==0)?"<NONE> ":"",
314		- (state->flags&SS_PWR_AUTO)?"PWR_AUTO ":"",
315		- (state->flags&SS_IOCARD)?"IOCARD ":"",
316		- (state->flags&SS_RESET)?"RESET ":"",
317		- (state->flags&SS_SPKR_ENA)?"SPKR_ENA ":"",
318		- (state->flags&SS_OUTPUT_ENA)?"OUTPUT_ENA ":"",
	312	+ debug(skt, 2, "mask: %s%s%s%s%s%s flags: %s%s%s%s%s%s Vcc %d Vpp %d irq %d\n",
	313	+ (state->csc_mask == 0) ? "<NONE> " : "",
	314	+ (state->csc_mask & SS_DETECT) ? "DETECT " : "",
	315	+ (state->csc_mask & SS_READY) ? "READY " : "",
	316	+ (state->csc_mask & SS_BATDEAD) ? "BATDEAD " : "",
	317	+ (state->csc_mask & SS_BATWARN) ? "BATWARN " : "",
	318	+ (state->csc_mask & SS_STSCHG) ? "STSCHG " : "",
	319	+ (state->flags == 0) ? "<NONE> " : "",
	320	+ (state->flags & SS_PWR_AUTO) ? "PWR_AUTO " : "",
	321	+ (state->flags & SS_IOCARD) ? "IOCARD " : "",
	322	+ (state->flags & SS_RESET) ? "RESET " : "",
	323	+ (state->flags & SS_SPKR_ENA) ? "SPKR_ENA " : "",
	324	+ (state->flags & SS_OUTPUT_ENA) ? "OUTPUT_ENA " : "",
319	325	state->Vcc, state->Vpp, state->io_irq);
320	326
321	327	return soc_common_pcmcia_config_skt(skt, state);
...	...	@@ -330,8 +336,8 @@
330	336	*
331	337	* Returns: 0 on success, -1 on error
332	338	*/
333		-static int
334		-soc_common_pcmcia_set_io_map(struct pcmcia_socket sock, struct pccard_io_map map)
	339	+static int soc_common_pcmcia_set_io_map(
	340	+ struct pcmcia_socket sock, struct pccard_io_map map)
335	341	{
336	342	struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
337	343	unsigned short speed = map->speed;
...	...	@@ -340,14 +346,14 @@
340	346	map->map, map->speed, (unsigned long long)map->start,
341	347	(unsigned long long)map->stop);
342	348	debug(skt, 2, "flags: %s%s%s%s%s%s%s%s\n",
343		- (map->flags==0)?"<NONE>":"",
344		- (map->flags&MAP_ACTIVE)?"ACTIVE ":"",
345		- (map->flags&MAP_16BIT)?"16BIT ":"",
346		- (map->flags&MAP_AUTOSZ)?"AUTOSZ ":"",
347		- (map->flags&MAP_0WS)?"0WS ":"",
348		- (map->flags&MAP_WRPROT)?"WRPROT ":"",
349		- (map->flags&MAP_USE_WAIT)?"USE_WAIT ":"",
350		- (map->flags&MAP_PREFETCH)?"PREFETCH ":"");
	349	+ (map->flags == 0) ? "<NONE>" : "",
	350	+ (map->flags & MAP_ACTIVE) ? "ACTIVE " : "",
	351	+ (map->flags & MAP_16BIT) ? "16BIT " : "",
	352	+ (map->flags & MAP_AUTOSZ) ? "AUTOSZ " : "",
	353	+ (map->flags & MAP_0WS) ? "0WS " : "",
	354	+ (map->flags & MAP_WRPROT) ? "WRPROT " : "",
	355	+ (map->flags & MAP_USE_WAIT) ? "USE_WAIT " : "",
	356	+ (map->flags & MAP_PREFETCH) ? "PREFETCH " : "");
351	357
352	358	if (map->map >= MAX_IO_WIN) {
353	359	printk(KERN_ERR "%s(): map (%d) out of range\n", __func__,
...	...	@@ -384,8 +390,8 @@
384	390	*
385	391	* Returns: 0 on success, -ERRNO on error
386	392	*/
387		-static int
388		-soc_common_pcmcia_set_mem_map(struct pcmcia_socket sock, struct pccard_mem_map map)
	393	+static int soc_common_pcmcia_set_mem_map(
	394	+ struct pcmcia_socket sock, struct pccard_mem_map map)
389	395	{
390	396	struct soc_pcmcia_socket *skt = to_soc_pcmcia_socket(sock);
391	397	struct resource *res;
...	...	@@ -394,14 +400,14 @@
394	400	debug(skt, 2, "map %u speed %u card_start %08x\n",
395	401	map->map, map->speed, map->card_start);
396	402	debug(skt, 2, "flags: %s%s%s%s%s%s%s%s\n",
397		- (map->flags==0)?"<NONE>":"",
398		- (map->flags&MAP_ACTIVE)?"ACTIVE ":"",
399		- (map->flags&MAP_16BIT)?"16BIT ":"",
400		- (map->flags&MAP_AUTOSZ)?"AUTOSZ ":"",
401		- (map->flags&MAP_0WS)?"0WS ":"",
402		- (map->flags&MAP_WRPROT)?"WRPROT ":"",
403		- (map->flags&MAP_ATTRIB)?"ATTRIB ":"",
404		- (map->flags&MAP_USE_WAIT)?"USE_WAIT ":"");
	403	+ (map->flags == 0) ? "<NONE>" : "",
	404	+ (map->flags & MAP_ACTIVE) ? "ACTIVE " : "",
	405	+ (map->flags & MAP_16BIT) ? "16BIT " : "",
	406	+ (map->flags & MAP_AUTOSZ) ? "AUTOSZ " : "",
	407	+ (map->flags & MAP_0WS) ? "0WS " : "",
	408	+ (map->flags & MAP_WRPROT) ? "WRPROT " : "",
	409	+ (map->flags & MAP_ATTRIB) ? "ATTRIB " : "",
	410	+ (map->flags & MAP_USE_WAIT) ? "USE_WAIT " : "");
405	411
406	412	if (map->map >= MAX_WIN)
407	413	return -EINVAL;
...	...	@@ -456,8 +462,8 @@
456	462	{ SS_OUTPUT_ENA, "SS_OUTPUT_ENA" },
457	463	};
458	464
459		-static void
460		-dump_bits(char *p, const char prefix, unsigned int val, struct bittbl *bits, int sz)
	465	+static void dump_bits(char *p, const char prefix,
	466	+ unsigned int val, struct bittbl *bits, int sz)
461	467	{
462	468	char b = p;
463	469	int i;
464	470
...	...	@@ -475,13 +481,14 @@
475	481	*
476	482	* Returns: the number of characters added to the buffer
477	483	*/
478		-static ssize_t show_status(struct device dev, struct device_attribute attr, char *buf)
	484	+static ssize_t show_status(
	485	+ struct device dev, struct device_attribute attr, char *buf)
479	486	{
480	487	struct soc_pcmcia_socket *skt =
481	488	container_of(dev, struct soc_pcmcia_socket, socket.dev);
482	489	char *p = buf;
483	490
484		- p+=sprintf(p, "slot : %d\n", skt->nr);
	491	+ p += sprintf(p, "slot : %d\n", skt->nr);
485	492
486	493	dump_bits(&p, "status", skt->status,
487	494	status_bits, ARRAY_SIZE(status_bits));
488	495
...	...	@@ -490,12 +497,12 @@
490	497	dump_bits(&p, "cs_flags", skt->cs_state.flags,
491	498	conf_bits, ARRAY_SIZE(conf_bits));
492	499
493		- p+=sprintf(p, "Vcc : %d\n", skt->cs_state.Vcc);
494		- p+=sprintf(p, "Vpp : %d\n", skt->cs_state.Vpp);
495		- p+=sprintf(p, "IRQ : %d (%d)\n", skt->cs_state.io_irq,
	500	+ p += sprintf(p, "Vcc : %d\n", skt->cs_state.Vcc);
	501	+ p += sprintf(p, "Vpp : %d\n", skt->cs_state.Vpp);
	502	+ p += sprintf(p, "IRQ : %d (%d)\n", skt->cs_state.io_irq,
496	503	skt->socket.pci_irq);
497	504	if (skt->ops->show_timing)
498		- p+=skt->ops->show_timing(skt, p);
	505	+ p += skt->ops->show_timing(skt, p);
499	506
500	507	return p-buf;
501	508	}
...	...	@@ -588,7 +595,7 @@
588	595
589	596	mutex_lock(&soc_pcmcia_sockets_lock);
590	597	list_for_each_entry(skt, &soc_pcmcia_sockets, node)
591		- if ( skt->ops->frequency_change )
	598	+ if (skt->ops->frequency_change)
592	599	ret += skt->ops->frequency_change(skt, val, freqs);
593	600	mutex_unlock(&soc_pcmcia_sockets_lock);
594	601
...	...	@@ -614,7 +621,8 @@
614	621
615	622	static void soc_pcmcia_cpufreq_unregister(void)
616	623	{
617		- cpufreq_unregister_notifier(&soc_pcmcia_notifier_block, CPUFREQ_TRANSITION_NOTIFIER);
	624	+ cpufreq_unregister_notifier(&soc_pcmcia_notifier_block,
	625	+ CPUFREQ_TRANSITION_NOTIFIER);
618	626	}
619	627	module_exit(soc_pcmcia_cpufreq_unregister);
620	628