Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pnp-log' into release

Browse Source
This commit is contained in:
Len Brown 2010-10-25 02:13:48 -04:00
commit 8c654bb808
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pnp/core.c
View File

@ -195,8 +195,9 @@ int pnp_add_device(struct pnp_dev *dev)
for (id = dev->id; id; id = id->next)
len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);
pnp_dbg(&dev->dev, "%s device, IDs%s (%s)\n",
dev->protocol->name, buf, dev->active ? "active" : "disabled");
dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs%s (%s)\n",
dev->protocol->name, buf,
dev->active ? "active" : "disabled");
return 0;
}

10
drivers/pnp/resource.c
View File

@ -523,7 +523,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
res->start = irq;
res->end = irq;
pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}
@ -544,7 +544,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
res->start = dma;
res->end = dma;
pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}
@ -568,7 +568,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
res->start = start;
res->end = end;
pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}
@ -592,7 +592,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
res->start = start;
res->end = end;
pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}
@ -616,7 +616,7 @@ struct pnp_resource *pnp_add_bus_resource(struct pnp_dev *dev,
res->start = start;
res->end = end;
pnp_dbg(&dev->dev, " add %pr\n", res);
dev_printk(KERN_DEBUG, &dev->dev, "%pR\n", res);
return pnp_res;
}