diff options
Diffstat (limited to 'drivers/pnp')
-rw-r--r-- | drivers/pnp/driver.c | 4 | ||||
-rw-r--r-- | drivers/pnp/pnpacpi/core.c | 6 |
2 files changed, 3 insertions, 7 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 | /** |
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index c1b9ea34977b..67c651bcaf71 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
@@ -255,14 +255,14 @@ int pnpacpi_disabled __initdata; | |||
255 | static int __init pnpacpi_init(void) | 255 | static int __init pnpacpi_init(void) |
256 | { | 256 | { |
257 | if (acpi_disabled || pnpacpi_disabled) { | 257 | if (acpi_disabled || pnpacpi_disabled) { |
258 | pnp_info("PnP ACPI: disabled"); | 258 | printk(KERN_INFO "pnp: PnP ACPI: disabled\n"); |
259 | return 0; | 259 | return 0; |
260 | } | 260 | } |
261 | pnp_info("PnP ACPI init"); | 261 | printk(KERN_INFO "pnp: PnP ACPI init\n"); |
262 | pnp_register_protocol(&pnpacpi_protocol); | 262 | pnp_register_protocol(&pnpacpi_protocol); |
263 | register_acpi_bus_type(&acpi_pnp_bus); | 263 | register_acpi_bus_type(&acpi_pnp_bus); |
264 | acpi_get_devices(NULL, pnpacpi_add_device_handler, NULL, NULL); | 264 | acpi_get_devices(NULL, pnpacpi_add_device_handler, NULL, NULL); |
265 | pnp_info("PnP ACPI: found %d devices", num); | 265 | printk(KERN_INFO "pnp: PnP ACPI: found %d devices\n", num); |
266 | unregister_acpi_bus_type(&acpi_pnp_bus); | 266 | unregister_acpi_bus_type(&acpi_pnp_bus); |
267 | pnp_platform_devices = 1; | 267 | pnp_platform_devices = 1; |
268 | return 0; | 268 | return 0; |