hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2010-11-13 10:00:15 -08:00
parent f8b372a11c 106665d937
commit 0143832cc9
11 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/pcmcia/cm4000_cs.c
View File

@ -979,8 +979,9 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
if (dev->flags0 & 1) {
set_bit(IS_CMM_ABSENT, &dev->flags);
rc = -ENODEV;
}
} else {
rc = -EIO;
}
goto release_io;
}

2
drivers/pcmcia/pxa2xx_sharpsl.c
View File

@ -237,7 +237,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
#ifdef CONFIG_SA1100_COLLIE
#include "sa11xx_base.h"
int __init pcmcia_collie_init(struct device *dev)
int __devinit pcmcia_collie_init(struct device *dev)
{
int ret = -ENODEV;

2
drivers/pcmcia/sa1100_assabet.c
View File

@ -130,7 +130,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = {
.socket_suspend = assabet_pcmcia_socket_suspend,
};
int pcmcia_assabet_init(struct device *dev)
int __devinit pcmcia_assabet_init(struct device *dev)
{
int ret = -ENODEV;

2
drivers/pcmcia/sa1100_cerf.c
View File

@ -97,7 +97,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = {
.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;

2
drivers/pcmcia/sa1100_generic.c
View File

@ -64,7 +64,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
#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;

2
drivers/pcmcia/sa1100_h3600.c
View File

@ -219,7 +219,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = {
.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;

2
drivers/pcmcia/sa1100_shannon.c
View File

@ -113,7 +113,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = {
.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;

2
drivers/pcmcia/sa1100_simpad.c
View File

@ -123,7 +123,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = {
.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;

9
drivers/pcmcia/soc_common.c
View File

@ -57,11 +57,16 @@ module_param(pc_debug, int, 0644);
void soc_pcmcia_debug(struct soc_pcmcia_socket *skt, const char *func,
int lvl, const char *fmt, ...)
{
struct va_format vaf;
va_list args;
if (pc_debug > lvl) {
printk(KERN_DEBUG "skt%u: %s: ", skt->nr, func);
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);
}
}