GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-23 23:03:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PNP: convert the last few pnp_info() uses to printk()

Browse source 
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>
This commit is contained in:
Bjorn Helgaas 2008-08-19 16:53:26 -06:00 • committed by Len Brown
parent 958a1fdd39
commit c865d2f6eb
3 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/pnp/driver.c
View file

@ -114,7 +114,6 @@ static int pnp_device_probe(struct device *dev)
} else } else
goto fail; goto fail;
dev_dbg(dev, "driver attached\n");
return error; return error;
fail: fail:
@ -210,8 +209,6 @@ struct bus_type pnp_bus_type = {
int pnp_register_driver(struct pnp_driver *drv) int pnp_register_driver(struct pnp_driver *drv)
{ {
pnp_dbg("the driver '%s' has been registered", drv->name);
drv->driver.name = drv->name; drv->driver.name = drv->name;
drv->driver.bus = &pnp_bus_type; drv->driver.bus = &pnp_bus_type;
@ -221,7 +218,6 @@ int pnp_register_driver(struct pnp_driver *drv)
void pnp_unregister_driver(struct pnp_driver *drv) void pnp_unregister_driver(struct pnp_driver *drv)
{ {
driver_unregister(&drv->driver); driver_unregister(&drv->driver);
pnp_dbg("the driver '%s' has been unregistered", drv->name);
} }
/** /**

6
drivers/pnp/pnpacpi/core.c
View file

@ -255,14 +255,14 @@ int pnpacpi_disabled __initdata;
static int __init pnpacpi_init(void) static int __init pnpacpi_init(void)
{ {
if (acpi_disabled || pnpacpi_disabled) { if (acpi_disabled || pnpacpi_disabled) {
pnp_info("PnP ACPI: disabled"); printk(KERN_INFO "pnp: PnP ACPI: disabled\n");
return 0; return 0;
} }
pnp_info("PnP ACPI init"); printk(KERN_INFO "pnp: PnP ACPI init\n");
pnp_register_protocol(&pnpacpi_protocol); pnp_register_protocol(&pnpacpi_protocol);
register_acpi_bus_type(&acpi_pnp_bus); register_acpi_bus_type(&acpi_pnp_bus);
acpi_get_devices(NULL, pnpacpi_add_device_handler, NULL, NULL); acpi_get_devices(NULL, pnpacpi_add_device_handler, NULL, NULL);
pnp_info("PnP ACPI: found %d devices", num); printk(KERN_INFO "pnp: PnP ACPI: found %d devices\n", num);
unregister_acpi_bus_type(&acpi_pnp_bus); unregister_acpi_bus_type(&acpi_pnp_bus);
pnp_platform_devices = 1; pnp_platform_devices = 1;
return 0; return 0;

10
include/linux/pnp.h
View file

@ -483,14 +483,4 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { }
#endif /* CONFIG_PNP */ #endif /* CONFIG_PNP */
#define pnp_err(format, arg...) printk(KERN_ERR "pnp: " format "\n" , ## arg)
#define pnp_info(format, arg...) printk(KERN_INFO "pnp: " format "\n" , ## arg)
#define pnp_warn(format, arg...) printk(KERN_WARNING "pnp: " format "\n" , ## arg)
#ifdef CONFIG_PNP_DEBUG
#define pnp_dbg(format, arg...) printk(KERN_DEBUG "pnp: " format "\n" , ## arg)
#else
#define pnp_dbg(format, arg...) do {} while (0)
#endif
#endif /* _LINUX_PNP_H */ #endif /* _LINUX_PNP_H */