Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c865d2f6 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 958a1fdd

drivers/pnp/driver.c

+0 −4
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ static int pnp_device_probe(struct device *dev) 
	} else

		goto fail;



	dev_dbg(dev, "driver attached\n");

	return error;



fail:
@@ -210,8 +209,6 @@ struct bus_type pnp_bus_type = { 


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.bus = &pnp_bus_type;
@@ -221,7 +218,6 @@ int pnp_register_driver(struct pnp_driver *drv) 
void pnp_unregister_driver(struct pnp_driver *drv)

{

	driver_unregister(&drv->driver);

	pnp_dbg("the driver '%s' has been unregistered", drv->name);

}



/**

drivers/pnp/pnpacpi/core.c

+3 −3
Original line number Diff line number Diff line
@@ -255,14 +255,14 @@ int pnpacpi_disabled __initdata; 
static int __init pnpacpi_init(void)

{

	if (acpi_disabled || pnpacpi_disabled) {

		pnp_info("PnP ACPI: disabled");

		printk(KERN_INFO "pnp: PnP ACPI: disabled\n");

		return 0;

	}

	pnp_info("PnP ACPI init");

	printk(KERN_INFO "pnp: PnP ACPI init\n");

	pnp_register_protocol(&pnpacpi_protocol);

	register_acpi_bus_type(&acpi_pnp_bus);

	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);

	pnp_platform_devices = 1;

	return 0;

include/linux/pnp.h

+0 −10
Original line number Diff line number Diff line
@@ -483,14 +483,4 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { } 


#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 */