mirror of
https://github.com/torvalds/linux.git
synced 2024-10-31 01:01:52 +00:00
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>
This commit is contained in:
Marcelo Roberto Jimenez
Russell King
parent
d2ccb52d88
commit
17b38ebb6a
@ -31,20 +31,20 @@
|
||||
======================================================================*/
|
||||
|
||||
|
||||
#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/mm.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/timer.h>
|
||||
#include <linux/mm.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,24 +304,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_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 @@ 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;
|
||||
@ -340,14 +346,14 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *m
|
||||
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 @@ 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;
|
||||
@ -394,14 +400,14 @@ soc_common_pcmcia_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map
|
||||
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 @@ 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,13 +481,14 @@ 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);
|
||||
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 @@ static ssize_t show_status(struct device *dev, struct device_attribute *attr, ch
|
||||
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 @@ soc_pcmcia_notifier(struct notifier_block *nb, unsigned long val, void *data)
|
||||
|
||||
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 @@ 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);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user