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

Commit 4846d017 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] zaurus: fix soc_common.c 



This fixes wrong comments, non-working debug subsystem, and some
potentially dangerous macros.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6edb7467

drivers/pcmcia/soc_common.c

+6 −8
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func, 
	if (pc_debug > lvl) {

	if (pc_debug > lvl) {

		printk(KERN_DEBUG "skt%u: %s: ", skt->nr, func);

		printk(KERN_DEBUG "skt%u: %s: ", skt->nr, func);

		va_start(args, fmt);

		va_start(args, fmt);

		printk(fmt, args);

		vprintk(fmt, args);

		va_end(args);

		va_end(args);

	}

	}

}

}
@@ -321,8 +321,6 @@ soc_common_pcmcia_get_socket(struct pcmcia_socket *sock, socket_state_t *state) 
 * less punt all of this work and let the kernel handle the details

 * less punt all of this work and let the kernel handle the details

 * of power configuration, reset, &c. We also record the value of

 * of power configuration, reset, &c. We also record the value of

 * `state' in order to regurgitate it to the PCMCIA core later.

 * `state' in order to regurgitate it to the PCMCIA core later.

 *

 * Returns: 0

 */

 */

static int

static int

soc_common_pcmcia_set_socket(struct pcmcia_socket *sock, socket_state_t *state)

soc_common_pcmcia_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
@@ -407,7 +405,7 @@ soc_common_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *m 
 * the map speed as requested, but override the address ranges

 * the map speed as requested, but override the address ranges

 * supplied by Card Services.

 * supplied by Card Services.

 *

 *

 * Returns: 0 on success, -1 on error

 * Returns: 0 on success, -ERRNO on error

 */

 */

static int

static int

soc_common_pcmcia_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *map)

soc_common_pcmcia_set_mem_map(struct pcmcia_socket *sock, struct pccard_mem_map *map)
@@ -655,8 +653,8 @@ static void soc_pcmcia_cpufreq_unregister(void) 
}

}





#else

#else

#define soc_pcmcia_cpufreq_register()

static int soc_pcmcia_cpufreq_register(void) { return 0; }

#define soc_pcmcia_cpufreq_unregister()

static void soc_pcmcia_cpufreq_unregister(void) {}

#endif

#endif





int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr)

int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr)