git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spi: s3c drivers shouldn't care about spi_board_info
[safe/jmp/linux-2.6]
/
drivers
/
pnp
/
driver.c
diff --git
a/drivers/pnp/driver.c
b/drivers/pnp/driver.c
index
9be01b0
..
a262762
100644
(file)
--- a/
drivers/pnp/driver.c
+++ b/
drivers/pnp/driver.c
@@
-86,9
+86,6
@@
static int pnp_device_probe(struct device *dev)
pnp_dev = to_pnp_dev(dev);
pnp_drv = to_pnp_driver(dev->driver);
pnp_dev = to_pnp_dev(dev);
pnp_drv = to_pnp_driver(dev->driver);
- pnp_dbg("match found with the PnP device '%s' and the driver '%s'",
- dev->bus_id, pnp_drv->name);
-
error = pnp_device_attach(pnp_dev);
if (error < 0)
return error;
error = pnp_device_attach(pnp_dev);
if (error < 0)
return error;
@@
-116,6
+113,8
@@
static int pnp_device_probe(struct device *dev)
error = 0;
} else
goto fail;
error = 0;
} else
goto fail;
+
+ dev_dbg(dev, "driver attached\n");
return error;
fail:
return error;
fail:
@@
-232,10
+231,6
@@
int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev)
{
struct pnp_id *ptr;
{
struct pnp_id *ptr;
- if (!id)
- return -EINVAL;
- if (!dev)
- return -EINVAL;
id->next = NULL;
ptr = dev->id;
while (ptr && ptr->next)
id->next = NULL;
ptr = dev->id;
while (ptr && ptr->next)