提交 0143832c 编写于 作者: L Linus Torvalds

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  drivers/pcmcia/soc_common.c: Use printf extension %pV
  pcmcia: fix warning in synclink driver
  pcmcia/sa1100: don't put machine specific init functions in .init.text
  pcmcia/cm4000: fix error code
  pd6729: Coding Style fixes
...@@ -979,8 +979,9 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count, ...@@ -979,8 +979,9 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
if (dev->flags0 & 1) { if (dev->flags0 & 1) {
set_bit(IS_CMM_ABSENT, &dev->flags); set_bit(IS_CMM_ABSENT, &dev->flags);
rc = -ENODEV; rc = -ENODEV;
} else {
rc = -EIO;
} }
rc = -EIO;
goto release_io; goto release_io;
} }
......
...@@ -725,17 +725,17 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, ...@@ -725,17 +725,17 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,
return 0; return 0;
err_out_free_res2: err_out_free_res2:
if (irq_mode == 1) if (irq_mode == 1)
free_irq(dev->irq, socket); free_irq(dev->irq, socket);
else else
del_timer_sync(&socket->poll_timer); del_timer_sync(&socket->poll_timer);
err_out_free_res: err_out_free_res:
pci_release_regions(dev); pci_release_regions(dev);
err_out_disable: err_out_disable:
pci_disable_device(dev); pci_disable_device(dev);
err_out_free_mem: err_out_free_mem:
kfree(socket); kfree(socket);
return ret; return ret;
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
struct pd6729_socket { struct pd6729_socket {
int number; int number;
int card_irq; int card_irq;
unsigned long io_base; /* base io address of the socket */ unsigned long io_base; /* base io address of the socket */
struct pcmcia_socket socket; struct pcmcia_socket socket;
struct timer_list poll_timer; struct timer_list poll_timer;
}; };
......
...@@ -237,7 +237,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { ...@@ -237,7 +237,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
#ifdef CONFIG_SA1100_COLLIE #ifdef CONFIG_SA1100_COLLIE
#include "sa11xx_base.h" #include "sa11xx_base.h"
int __init pcmcia_collie_init(struct device *dev) int __devinit pcmcia_collie_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;
......
...@@ -130,7 +130,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = { ...@@ -130,7 +130,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = {
.socket_suspend = assabet_pcmcia_socket_suspend, .socket_suspend = assabet_pcmcia_socket_suspend,
}; };
int pcmcia_assabet_init(struct device *dev) int __devinit pcmcia_assabet_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;
......
...@@ -97,7 +97,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = { ...@@ -97,7 +97,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = {
.socket_suspend = cerf_pcmcia_socket_suspend, .socket_suspend = cerf_pcmcia_socket_suspend,
}; };
int __init pcmcia_cerf_init(struct device *dev) int __devinit pcmcia_cerf_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;
......
...@@ -64,7 +64,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = { ...@@ -64,7 +64,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
#endif #endif
}; };
static int sa11x0_drv_pcmcia_probe(struct platform_device *dev) static int __devinit sa11x0_drv_pcmcia_probe(struct platform_device *dev)
{ {
int i, ret = -ENODEV; int i, ret = -ENODEV;
......
...@@ -219,7 +219,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = { ...@@ -219,7 +219,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = {
.socket_suspend = h3600_pcmcia_socket_suspend, .socket_suspend = h3600_pcmcia_socket_suspend,
}; };
int __init pcmcia_h3600_init(struct device *dev) int __devinit pcmcia_h3600_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;
......
...@@ -113,7 +113,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = { ...@@ -113,7 +113,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = {
.socket_suspend = shannon_pcmcia_socket_suspend, .socket_suspend = shannon_pcmcia_socket_suspend,
}; };
int __init pcmcia_shannon_init(struct device *dev) int __devinit pcmcia_shannon_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;
......
...@@ -123,7 +123,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = { ...@@ -123,7 +123,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = {
.socket_suspend = simpad_pcmcia_socket_suspend, .socket_suspend = simpad_pcmcia_socket_suspend,
}; };
int __init pcmcia_simpad_init(struct device *dev) int __devinit pcmcia_simpad_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;
......
...@@ -57,11 +57,16 @@ module_param(pc_debug, int, 0644); ...@@ -57,11 +57,16 @@ module_param(pc_debug, int, 0644);
void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func, void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func,
int lvl, const char *fmt, ...) int lvl, const char *fmt, ...)
{ {
struct va_format vaf;
va_list args; va_list args;
if (pc_debug > lvl) { if (pc_debug > lvl) {
printk(KERN_DEBUG "skt%u: %s: ", skt->nr, func);
va_start(args, fmt); va_start(args, fmt);
vprintk(fmt, args);
vaf.fmt = fmt;
vaf.va = &args;
printk(KERN_DEBUG "skt%u: %s: %pV", skt->nr, func, &vaf);
va_end(args); va_end(args);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册