|
@@ -66,7 +66,7 @@ void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func,
|
|
|
if (pc_debug > lvl) {
|
|
|
printk(KERN_DEBUG "skt%u: %s: ", skt->nr, func);
|
|
|
va_start(args, fmt);
|
|
|
- printk(fmt, args);
|
|
|
+ vprintk(fmt, 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
|
|
|
* of power configuration, reset, &c. We also record the value of
|
|
|
* `state' in order to regurgitate it to the PCMCIA core later.
|
|
|
- *
|
|
|
- * Returns: 0
|
|
|
*/
|
|
|
static int
|
|
|
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
|
|
|
* supplied by Card Services.
|
|
|
*
|
|
|
- * Returns: 0 on success, -1 on error
|
|
|
+ * Returns: 0 on success, -ERRNO on error
|
|
|
*/
|
|
|
static int
|
|
|
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
|
|
|
-#define soc_pcmcia_cpufreq_register()
|
|
|
-#define soc_pcmcia_cpufreq_unregister()
|
|
|
+static int soc_pcmcia_cpufreq_register(void) { return 0; }
|
|
|
+static void soc_pcmcia_cpufreq_unregister(void) {}
|
|
|
#endif
|
|
|
|
|
|
int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr)
|
|
@@ -738,7 +736,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
|
|
|
goto out_err_5;
|
|
|
}
|
|
|
|
|
|
- if ( list_empty(&soc_pcmcia_sockets) )
|
|
|
+ if (list_empty(&soc_pcmcia_sockets))
|
|
|
soc_pcmcia_cpufreq_register();
|
|
|
|
|
|
list_add(&skt->node, &soc_pcmcia_sockets);
|
|
@@ -839,7 +837,7 @@ int soc_common_drv_pcmcia_remove(struct device *dev)
|
|
|
release_resource(&skt->res_io);
|
|
|
release_resource(&skt->res_skt);
|
|
|
}
|
|
|
- if ( list_empty(&soc_pcmcia_sockets) )
|
|
|
+ if (list_empty(&soc_pcmcia_sockets))
|
|
|
soc_pcmcia_cpufreq_unregister();
|
|
|
|
|
|
up(&soc_pcmcia_sockets_lock);
|