aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-08-19 18:53:26 -0400
committerLen Brown <len.brown@intel.com>2008-10-10 23:27:18 -0400
commitc865d2f6eb160c15b74245b4891c8e945d67d96c (patch)
tree7ccbb4e90585d1e1d01aab70a4029b111caf96e5
parent958a1fdd3904b009c926cb840be48ce3c5f2389e (diff)
PNP: convert the last few pnp_info() uses to printk()
There are only a few remaining uses of pnp_info(), so I just converted them to printk and removed the pnp_err(), pnp_info(), pnp_warn(), and pnp_dbg() wrappers. I also removed a couple debug messages that don't seem useful any more ("driver registered", "driver unregistered", "driver attached"). Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/pnp/driver.c4
-rw-r--r--drivers/pnp/pnpacpi/core.c6
-rw-r--r--include/linux/pnp.h10
3 files changed, 3 insertions, 17 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index d3f869ee1d9..54673a4f590 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
120fail: 119fail:
@@ -210,8 +209,6 @@ struct bus_type pnp_bus_type = {
210 209
211int pnp_register_driver(struct pnp_driver *drv) 210int 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)
221void pnp_unregister_driver(struct pnp_driver *drv) 218void 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 c1b9ea34977..67c651bcaf7 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -255,14 +255,14 @@ int pnpacpi_disabled __initdata;
255static int __init pnpacpi_init(void) 255static 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;
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index be764e514e3..05daecec16c 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -483,14 +483,4 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { }
483 483
484#endif /* CONFIG_PNP */ 484#endif /* CONFIG_PNP */
485 485
486#define pnp_err(format, arg...) printk(KERN_ERR "pnp: " format "\n" , ## arg)
487#define pnp_info(format, arg...) printk(KERN_INFO "pnp: " format "\n" , ## arg)
488#define pnp_warn(format, arg...) printk(KERN_WARNING "pnp: " format "\n" , ## arg)
489
490#ifdef CONFIG_PNP_DEBUG
491#define pnp_dbg(format, arg...) printk(KERN_DEBUG "pnp: " format "\n" , ## arg)
492#else
493#define pnp_dbg(format, arg...) do {} while (0)
494#endif
495
496#endif /* _LINUX_PNP_H */ 486#endif /* _LINUX_PNP_H */