microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

pcmcia: use dev_printk in module rsrc_nonstatic 

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2008-08-02 21:36:19 +02:00
Родитель ac449d6e2c
Коммит dbe4ea5fde
1 изменённых файлов: 18 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

33
drivers/pcmcia/rsrc_nonstatic.c
Просмотреть файл

@ -194,13 +194,14 @@ static void do_io_probe(struct pcmcia_socket *s, unsigned int base,
int any; int any;
u_char *b, hole, most; u_char *b, hole, most;
printk(KERN_INFO "cs: IO port probe %#x-%#x:", dev_printk(KERN_INFO, &s->dev, "cs: IO port probe %#x-%#x:",
base, base+num-1); base, base+num-1);
/* First, what does a floating port look like? */ /* First, what does a floating port look like? */
b = kzalloc(256, GFP_KERNEL); b = kzalloc(256, GFP_KERNEL);
if (!b) { if (!b) {
printk(KERN_ERR "do_io_probe: unable to kmalloc 256 bytes"); dev_printk(KERN_ERR, &s->dev,
"do_io_probe: unable to kmalloc 256 bytes");
return; return;
} }
for (i = base, most = 0; i < base+num; i += 8) { for (i = base, most = 0; i < base+num; i += 8) {
@ -366,8 +367,8 @@ static int do_mem_probe(u_long base, u_long num, struct pcmcia_socket *s)
struct socket_data *s_data = s->resource_data; struct socket_data *s_data = s->resource_data;
u_long i, j, bad, fail, step; u_long i, j, bad, fail, step;
printk(KERN_INFO "cs: memory probe 0x%06lx-0x%06lx:", dev_printk(KERN_INFO, &s->dev, "cs: memory probe 0x%06lx-0x%06lx:",
base, base+num-1); base, base+num-1);
bad = fail = 0; bad = fail = 0;
step = (num < 0x20000) ? 0x2000 : ((num>>4) & ~0x1fff); step = (num < 0x20000) ? 0x2000 : ((num>>4) & ~0x1fff);
/* don't allow too large steps */ /* don't allow too large steps */
@ -431,8 +432,8 @@ static int validate_mem(struct pcmcia_socket *s, unsigned int probe_mask)
if (probe_mask & MEM_PROBE_HIGH) { if (probe_mask & MEM_PROBE_HIGH) {
if (inv_probe(s_data->mem_db.next, s) > 0) if (inv_probe(s_data->mem_db.next, s) > 0)
return 0; return 0;
printk(KERN_NOTICE "cs: warning: no high memory space " dev_printk(KERN_NOTICE, &s->dev,
"available!\n"); "cs: warning: no high memory space available!\n");
return -ENODEV; return -ENODEV;
} }
@ -794,10 +795,11 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
if (res->flags & IORESOURCE_IO) { if (res->flags & IORESOURCE_IO) {
if (res == &ioport_resource) if (res == &ioport_resource)
continue; continue;
printk(KERN_INFO "pcmcia: parent PCI bridge I/O " dev_printk(KERN_INFO, &s->cb_dev->dev,
"window: 0x%llx - 0x%llx\n", "pcmcia: parent PCI bridge I/O "
(unsigned long long)res->start, "window: 0x%llx - 0x%llx\n",
(unsigned long long)res->end); (unsigned long long)res->start,
(unsigned long long)res->end);
if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end)) if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end))
done |= IORESOURCE_IO; done |= IORESOURCE_IO;
@ -806,10 +808,11 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
if (res->flags & IORESOURCE_MEM) { if (res->flags & IORESOURCE_MEM) {
if (res == &iomem_resource) if (res == &iomem_resource)
continue; continue;
printk(KERN_INFO "pcmcia: parent PCI bridge Memory " dev_printk(KERN_INFO, &s->cb_dev->dev,
"window: 0x%llx - 0x%llx\n", "pcmcia: parent PCI bridge Memory "
(unsigned long long)res->start, "window: 0x%llx - 0x%llx\n",
(unsigned long long)res->end); (unsigned long long)res->start,
(unsigned long long)res->end);
if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end)) if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end))
done |= IORESOURCE_MEM; done |= IORESOURCE_MEM;
} }