diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:20:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:20:36 -0400 |
commit | 765426e8ee4c0ab2bc9d44951f4865b8494cdbd0 (patch) | |
tree | 2b46ab8953eff175c8d3474a9754c1ab1394e4de /drivers/pnp/driver.c | |
parent | 36ec891895020f3bc9953c8b11d079c6d77d76bd (diff) | |
parent | 898b054f3eec5921320ae8614b5bdd7b07ea5b43 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (123 commits)
dock: make dock driver not a module
ACPI: fix ia64 build warning
ACPI: hack around sysfs warning with link order
ACPI suspend: fix build warning when CONFIG_ACPI_SLEEP=n
intel_menlo: fix build warning
panasonic-laptop: fix build
ACPICA: Update version to 20080926
ACPICA: Add support for zero-length buffer-to-string conversions
ACPICA: New: Validation for predefined ACPI methods/objects
ACPICA: Fix for implicit return compatibility
ACPICA: Fixed a couple memory leaks associated with "implicit return"
ACPICA: Optimize buffer allocation procedure
ACPICA: Fix possible memory leak, error exit path
ACPICA: Fix fault after mem allocation failure in AML parser
ACPICA: Remove unused ACPI register bit definition
ACPICA: Update version to 20080829
ACPICA: Fix possible memory leak in acpi_ns_get_external_pathname
ACPICA: Cleanup for internal Reference Object
ACPICA: Update comments - no functional changes
ACPICA: Update for Reference ACPI_OPERAND_OBJECT
...
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 e3f7e89c4dfb..527ee764c93f 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: |
@@ -211,8 +210,6 @@ struct bus_type pnp_bus_type = { | |||
211 | 210 | ||
212 | int pnp_register_driver(struct pnp_driver *drv) | 211 | int pnp_register_driver(struct pnp_driver *drv) |
213 | { | 212 | { |
214 | pnp_dbg("the driver '%s' has been registered", drv->name); | ||
215 | |||
216 | drv->driver.name = drv->name; | 213 | drv->driver.name = drv->name; |
217 | drv->driver.bus = &pnp_bus_type; | 214 | drv->driver.bus = &pnp_bus_type; |
218 | 215 | ||
@@ -222,7 +219,6 @@ int pnp_register_driver(struct pnp_driver *drv) | |||
222 | void pnp_unregister_driver(struct pnp_driver *drv) | 219 | void pnp_unregister_driver(struct pnp_driver *drv) |
223 | { | 220 | { |
224 | driver_unregister(&drv->driver); | 221 | driver_unregister(&drv->driver); |
225 | pnp_dbg("the driver '%s' has been unregistered", drv->name); | ||
226 | } | 222 | } |
227 | 223 | ||
228 | /** | 224 | /** |