Merge branch 'pnp-log' into release (8c654bb8) · Commits · 戴 / test

drivers/pnp/core.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}