* [PATCH 1/2] ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module. @ 2010-03-24 23:04 Marcelo Roberto Jimenez 2010-03-24 23:04 ` [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c Marcelo Roberto Jimenez 0 siblings, 1 reply; 15+ messages in thread From: Marcelo Roberto Jimenez @ 2010-03-24 23:04 UTC (permalink / raw) To: Dominik Brodowski, Russell King, Marcelo Roberto Jimenez, Wolfram Sang Cc: linux-arm-kernel, linux-kernel, linux-pcmcia, Marcelo Roberto Jimenez 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 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-24 23:04 [PATCH 1/2] ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module Marcelo Roberto Jimenez @ 2010-03-24 23:04 ` Marcelo Roberto Jimenez 2010-03-24 23:07 ` Russell King - ARM Linux 2010-03-24 23:45 ` Marcelo Roberto Jimenez 0 siblings, 2 replies; 15+ messages in thread From: Marcelo Roberto Jimenez @ 2010-03-24 23:04 UTC (permalink / raw) To: Dominik Brodowski, Russell King, Marcelo Roberto Jimenez, Wolfram Sang Cc: linux-arm-kernel, linux-kernel, linux-pcmcia, Marcelo Roberto Jimenez 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, 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,25 @@ 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); @@ -331,8 +338,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; @@ -341,14 +348,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__, @@ -385,8 +392,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; @@ -395,14 +402,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; @@ -457,8 +464,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; @@ -476,13 +483,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)); @@ -491,12 +499,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; } @@ -589,7 +597,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); @@ -615,7 +623,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); -- 1.7.0.3 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-24 23:04 ` [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c Marcelo Roberto Jimenez @ 2010-03-24 23:07 ` Russell King - ARM Linux 2010-03-24 23:20 ` Marcelo Jimenez 2010-03-25 10:19 ` Sergei Shtylyov 2010-03-24 23:45 ` Marcelo Roberto Jimenez 1 sibling, 2 replies; 15+ messages in thread From: Russell King - ARM Linux @ 2010-03-24 23:07 UTC (permalink / raw) To: Marcelo Roberto Jimenez Cc: Dominik Brodowski, Wolfram Sang, linux-arm-kernel, linux-kernel, linux-pcmcia On Wed, Mar 24, 2010 at 08:04:58PM -0300, Marcelo Roberto Jimenez wrote: > - 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", NAK. Breaking kernel messages across multiple lines makes them impossible to grep for. checkpatch.pl is wrong on this one. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-24 23:07 ` Russell King - ARM Linux @ 2010-03-24 23:20 ` Marcelo Jimenez 2010-03-26 15:56 ` Valdis.Kletnieks 2010-03-25 10:19 ` Sergei Shtylyov 1 sibling, 1 reply; 15+ messages in thread From: Marcelo Jimenez @ 2010-03-24 23:20 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Dominik Brodowski, Wolfram Sang, linux-arm-kernel, linux-kernel, linux-pcmcia On Wed, Mar 24, 2010 at 20:07, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Wed, Mar 24, 2010 at 08:04:58PM -0300, Marcelo Roberto Jimenez wrote: >> - 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", > > NAK. Breaking kernel messages across multiple lines makes them impossible > to grep for. checkpatch.pl is wrong on this one. I will redo it, no problem. But just for my information, in that particular case, is it usefull to grep using format specifiers? ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-24 23:20 ` Marcelo Jimenez @ 2010-03-26 15:56 ` Valdis.Kletnieks 0 siblings, 0 replies; 15+ messages in thread From: Valdis.Kletnieks @ 2010-03-26 15:56 UTC (permalink / raw) To: Marcelo Jimenez Cc: Russell King - ARM Linux, Dominik Brodowski, Wolfram Sang, linux-arm-kernel, linux-kernel, linux-pcmcia [-- Attachment #1: Type: text/plain, Size: 551 bytes --] On Wed, 24 Mar 2010 20:20:19 -0300, Marcelo Jimenez said: >> - debug(skt, 2, "mask: %s%s%s%s%s%sflags: %s%s%s%s%s%sVcc %d Vpp %d irq %d\n", > I will redo it, no problem. But just for my information, in that > particular case, is it usefull to grep using format specifiers? 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. [-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-24 23:07 ` Russell King - ARM Linux 2010-03-24 23:20 ` Marcelo Jimenez @ 2010-03-25 10:19 ` Sergei Shtylyov 2010-03-25 18:26 ` Valdis.Kletnieks 2010-03-26 18:18 ` Russell King - ARM Linux 1 sibling, 2 replies; 15+ messages in thread From: Sergei Shtylyov @ 2010-03-25 10:19 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Marcelo Roberto Jimenez, linux-arm-kernel, linux-pcmcia, Wolfram Sang, Dominik Brodowski, linux-kernel Hello. Russell King - ARM Linux wrote: >> - 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", >> > > NAK. Breaking kernel messages across multiple lines makes them impossible > to grep for. checkpatch.pl is wrong on this one. > 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-25 10:19 ` Sergei Shtylyov @ 2010-03-25 18:26 ` Valdis.Kletnieks 2010-03-26 18:18 ` Russell King - ARM Linux 1 sibling, 0 replies; 15+ messages in thread From: Valdis.Kletnieks @ 2010-03-25 18:26 UTC (permalink / raw) To: Sergei Shtylyov Cc: Russell King - ARM Linux, Marcelo Roberto Jimenez, linux-arm-kernel, linux-pcmcia, Wolfram Sang, Dominik Brodowski, linux-kernel [-- Attachment #1: Type: text/plain, Size: 219 bytes --] On Thu, 25 Mar 2010 13:19:29 +0300, Sergei Shtylyov said: > I'd disagree in this case. Anybody will hardly grep for "mask: > %s%s%s%s%s%sflags: %s%s%s%s%s%s". However, egrep 'mask: .*flags: ' is quite plausible. [-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-25 10:19 ` Sergei Shtylyov 2010-03-25 18:26 ` Valdis.Kletnieks @ 2010-03-26 18:18 ` Russell King - ARM Linux 2010-03-26 21:57 ` Marcelo Jimenez 1 sibling, 1 reply; 15+ messages in thread From: Russell King - ARM Linux @ 2010-03-26 18:18 UTC (permalink / raw) To: Sergei Shtylyov Cc: Marcelo Roberto Jimenez, linux-arm-kernel, linux-pcmcia, Wolfram Sang, Dominik Brodowski, linux-kernel On Thu, Mar 25, 2010 at 01:19:29PM +0300, Sergei Shtylyov wrote: > Hello. > > Russell King - ARM Linux wrote: > >>> - 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", >>> >> >> NAK. Breaking kernel messages across multiple lines makes them impossible >> to grep for. checkpatch.pl is wrong on this one. >> > > I'd disagree in this case. Anybody will hardly grep for "mask: > %s%s%s%s%s%sflags: %s%s%s%s%s%s". 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. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-26 18:18 ` Russell King - ARM Linux @ 2010-03-26 21:57 ` Marcelo Jimenez 2010-03-26 23:06 ` Russell King - ARM Linux 0 siblings, 1 reply; 15+ messages in thread From: Marcelo Jimenez @ 2010-03-26 21:57 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Sergei Shtylyov, linux-arm-kernel, linux-pcmcia, Wolfram Sang, Dominik Brodowski, linux-kernel On Fri, Mar 26, 2010 at 15:18, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Thu, Mar 25, 2010 at 01:19:29PM +0300, Sergei Shtylyov wrote: >> >> I'd disagree in this case. Anybody will hardly grep for "mask: >> %s%s%s%s%s%sflags: %s%s%s%s%s%s". > > 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. This is no big deal. Also, I have already submitted the new patch and Valdis had a good point for egrep. Regards, Marcelo. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-26 21:57 ` Marcelo Jimenez @ 2010-03-26 23:06 ` Russell King - ARM Linux 0 siblings, 0 replies; 15+ messages in thread From: Russell King - ARM Linux @ 2010-03-26 23:06 UTC (permalink / raw) To: Marcelo Jimenez Cc: Sergei Shtylyov, linux-arm-kernel, linux-pcmcia, Wolfram Sang, Dominik Brodowski, linux-kernel On Fri, Mar 26, 2010 at 06:57:07PM -0300, Marcelo Jimenez wrote: > On Fri, Mar 26, 2010 at 15:18, Russell King - ARM Linux > <linux@arm.linux.org.uk> wrote: > > On Thu, Mar 25, 2010 at 01:19:29PM +0300, Sergei Shtylyov wrote: > >> > >> I'd disagree in this case. Anybody will hardly grep for "mask: > >> %s%s%s%s%s%sflags: %s%s%s%s%s%s". > > > > 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. > > This is no big deal. Also, I have already submitted the new patch and > Valdis had a good point for egrep. 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. ;( ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-24 23:04 ` [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c Marcelo Roberto Jimenez 2010-03-24 23:07 ` Russell King - ARM Linux @ 2010-03-24 23:45 ` Marcelo Roberto Jimenez 2010-03-25 17:04 ` Dominik Brodowski 1 sibling, 1 reply; 15+ messages in thread From: Marcelo Roberto Jimenez @ 2010-03-24 23:45 UTC (permalink / raw) To: Dominik Brodowski, Russell King, Marcelo Roberto Jimenez, Wolfram Sang Cc: linux-arm-kernel, linux-kernel, linux-pcmcia, Marcelo Roberto Jimenez 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, 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_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); @@ -331,8 +337,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; @@ -341,14 +347,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__, @@ -385,8 +391,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; @@ -395,14 +401,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; @@ -457,8 +463,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; @@ -476,13 +482,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)); @@ -491,12 +498,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; } @@ -589,7 +596,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); @@ -615,7 +622,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); -- 1.7.0.3 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-24 23:45 ` Marcelo Roberto Jimenez @ 2010-03-25 17:04 ` Dominik Brodowski 2010-03-25 17:47 ` Marcelo Jimenez 2010-03-28 9:44 ` Russell King - ARM Linux 0 siblings, 2 replies; 15+ messages in thread From: Dominik Brodowski @ 2010-03-25 17:04 UTC (permalink / raw) To: Marcelo Roberto Jimenez, Russell King Cc: Wolfram Sang, Marcelo Roberto Jimenez, linux-arm-kernel, linux-kernel, linux-pcmcia 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 <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, 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_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); > @@ -331,8 +337,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; > @@ -341,14 +347,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__, > @@ -385,8 +391,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; > @@ -395,14 +401,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; > @@ -457,8 +463,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; > @@ -476,13 +482,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)); > @@ -491,12 +498,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; > } > @@ -589,7 +596,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); > > @@ -615,7 +622,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); > > -- > 1.7.0.3 > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-25 17:04 ` Dominik Brodowski @ 2010-03-25 17:47 ` Marcelo Jimenez 2010-03-28 9:44 ` Russell King - ARM Linux 1 sibling, 0 replies; 15+ messages in thread From: Marcelo Jimenez @ 2010-03-25 17:47 UTC (permalink / raw) To: Marcelo Roberto Jimenez, Russell King, Wolfram Sang, linux-arm-kernel, linux-kernel, linux-pcmcia On Thu, Mar 25, 2010 at 14:04, Dominik Brodowski <linux@dominikbrodowski.net> wrote: > Russell, > > do you prefer me pushing these patches upstream (possibly even for -rc3), or > do you wish to take these patches? 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 beeing the second). > Best, > Dominik Regards, Marcelo. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-25 17:04 ` Dominik Brodowski 2010-03-25 17:47 ` Marcelo Jimenez @ 2010-03-28 9:44 ` Russell King - ARM Linux 2010-03-28 9:46 ` Dominik Brodowski 1 sibling, 1 reply; 15+ messages in thread From: Russell King - ARM Linux @ 2010-03-28 9:44 UTC (permalink / raw) To: Dominik Brodowski Cc: Marcelo Roberto Jimenez, Wolfram Sang, linux-arm-kernel, linux-kernel, linux-pcmcia On Thu, Mar 25, 2010 at 06:04:40PM +0100, Dominik Brodowski wrote: > do you prefer me pushing these patches upstream (possibly even for -rc3), or > do you wish to take these patches? I'll take them through the patch system, but as they're not bug fixes I'd queue them for the next merge window. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c 2010-03-28 9:44 ` Russell King - ARM Linux @ 2010-03-28 9:46 ` Dominik Brodowski 0 siblings, 0 replies; 15+ messages in thread From: Dominik Brodowski @ 2010-03-28 9:46 UTC (permalink / raw) To: Russell King - ARM Linux Cc: Marcelo Roberto Jimenez, Wolfram Sang, linux-arm-kernel, linux-kernel, linux-pcmcia On Sun, Mar 28, 2010 at 10:44:08AM +0100, Russell King - ARM Linux wrote: > On Thu, Mar 25, 2010 at 06:04:40PM +0100, Dominik Brodowski wrote: > > do you prefer me pushing these patches upstream (possibly even for -rc3), or > > do you wish to take these patches? > > I'll take them through the patch system, but as they're not bug fixes > I'd queue them for the next merge window. Excellent, thanks a lot. Best, Dominik ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2010-03-28 9:46 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-03-24 23:04 [PATCH 1/2] ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module Marcelo Roberto Jimenez 2010-03-24 23:04 ` [PATCH 2/2] ARM: pcmcia: fix checkpatch.pl issues in soc_common.c Marcelo Roberto Jimenez 2010-03-24 23:07 ` Russell King - ARM Linux 2010-03-24 23:20 ` Marcelo Jimenez 2010-03-26 15:56 ` Valdis.Kletnieks 2010-03-25 10:19 ` Sergei Shtylyov 2010-03-25 18:26 ` Valdis.Kletnieks 2010-03-26 18:18 ` Russell King - ARM Linux 2010-03-26 21:57 ` Marcelo Jimenez 2010-03-26 23:06 ` Russell King - ARM Linux 2010-03-24 23:45 ` Marcelo Roberto Jimenez 2010-03-25 17:04 ` Dominik Brodowski 2010-03-25 17:47 ` Marcelo Jimenez 2010-03-28 9:44 ` Russell King - ARM Linux 2010-03-28 9:46 ` Dominik Brodowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).