Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17b38ebb authored by Marcelo Roberto Jimenez's avatar Marcelo Roberto Jimenez Committed by Russell King
Browse files

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: default avatarMarcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d2ccb52d

drivers/pcmcia/soc_common.c

+68 −60
Original line number Diff line number Diff line
@@ -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 @@ void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func, 


#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 @@ 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);
@@ -131,8 +136,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;
@@ -144,7 +149,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);
@@ -298,8 +304,8 @@ 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);
@@ -330,8 +336,8 @@ soc_common_pcmcia_set_socket(struct pcmcia_socket *sock, socket_state_t *state) 
 *

 * 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;
@@ -384,8 +390,8 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *m 
 *

 * 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;
@@ -456,8 +462,8 @@ static struct bittbl conf_bits[] = { 
	{ 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,7 +481,8 @@ dump_bits(char **p, const char *prefix, unsigned int val, struct bittbl *bits, i 
 *

 * 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);
@@ -614,7 +621,8 @@ fs_initcall(soc_pcmcia_cpufreq_register); 


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);