diff options
author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:43 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:43 -0400 |
commit | 4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841 (patch) | |
tree | 2b80f6f9d3b5b1ff4600810c4a30917b2d66b7ab /drivers/pnp/driver.c | |
parent | 5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (diff) | |
parent | ac88a8f3f7df04774b386ddaf586040adb819b58 (diff) |
Merge branch 'pnp-debug' into test
Diffstat (limited to 'drivers/pnp/driver.c')
-rw-r--r-- | drivers/pnp/driver.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index d3f869ee1d92..54673a4f5901 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c | |||
@@ -114,7 +114,6 @@ static int pnp_device_probe(struct device *dev) | |||
114 | } else | 114 | } else |
115 | goto fail; | 115 | goto fail; |
116 | 116 | ||
117 | dev_dbg(dev, "driver attached\n"); | ||
118 | return error; | 117 | return error; |
119 | 118 | ||
120 | fail: | 119 | fail: |
@@ -210,8 +209,6 @@ struct bus_type pnp_bus_type = { | |||
210 | 209 | ||
211 | int pnp_register_driver(struct pnp_driver *drv) | 210 | int pnp_register_driver(struct pnp_driver *drv) |
212 | { | 211 | { |
213 | pnp_dbg("the driver '%s' has been registered", drv->name); | ||
214 | |||
215 | drv->driver.name = drv->name; | 212 | drv->driver.name = drv->name; |
216 | drv->driver.bus = &pnp_bus_type; | 213 | drv->driver.bus = &pnp_bus_type; |
217 | 214 | ||
@@ -221,7 +218,6 @@ int pnp_register_driver(struct pnp_driver *drv) | |||
221 | void pnp_unregister_driver(struct pnp_driver *drv) | 218 | void pnp_unregister_driver(struct pnp_driver *drv) |
222 | { | 219 | { |
223 | driver_unregister(&drv->driver); | 220 | driver_unregister(&drv->driver); |
224 | pnp_dbg("the driver '%s' has been unregistered", drv->name); | ||
225 | } | 221 | } |
226 | 222 | ||
227 | /** | 223 | /** |