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

Commit 2cfd93dd authored by Joe Perches's avatar Joe Perches Committed by Rafael J. Wysocki
Browse files

ACPI / PCI: pci_slot: Use more common logging style 



Use generic pr_<level> functions with pr_fmt for info and err.

This also reduces object size a trivial bit:

$ size drivers/acpi/pci_slot.o*
   text	   data	    bss	    dec	    hex	filename
    935	    752	      5	   1692	    69c	drivers/acpi/pci_slot.o.new
   1027	    752	      5	   1784	    6f8	drivers/acpi/pci_slot.o.old

Miscellanea:

o Remove unnecessary OOM message as k.alloc functions get a generic
  stack dump on OOM
o Remove unnecessary embedded prefix from a dbg() message

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 33688abb

drivers/acpi/pci_slot.c

+13 −15
Original line number Original line Diff line number Diff line
@@ -22,6 +22,8 @@ 
 *  General Public License for more details.

 *  General Public License for more details.

 */

 */





#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>
@@ -48,13 +50,10 @@ module_param(debug, bool, 0644); 
#define _COMPONENT		ACPI_PCI_COMPONENT

#define _COMPONENT		ACPI_PCI_COMPONENT

ACPI_MODULE_NAME("pci_slot");

ACPI_MODULE_NAME("pci_slot");





#define MY_NAME "pci_slot"

#define dbg(fmt, ...)						\

#define err(format, arg...) pr_err("%s: " format , MY_NAME , ## arg)

#define info(format, arg...) pr_info("%s: " format , MY_NAME , ## arg)

#define dbg(format, arg...)					\

do {								\

do {								\

	if (debug)						\

	if (debug)						\

			pr_debug("%s: " format,	MY_NAME , ## arg); \

		pr_debug(fmt, ##__VA_ARGS__);			\

} while (0)

} while (0)





#define SLOT_NAME_SIZE 21		/* Inspired by #define in acpiphp.h */

#define SLOT_NAME_SIZE 21		/* Inspired by #define in acpiphp.h */
@@ -132,15 +131,13 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 
	}

	}





	slot = kmalloc(sizeof(*slot), GFP_KERNEL);

	slot = kmalloc(sizeof(*slot), GFP_KERNEL);

	if (!slot) {

	if (!slot)

		err("%s: cannot allocate memory\n", __func__);

		return AE_OK;

		return AE_OK;

	}





	snprintf(name, sizeof(name), "%llu", sun);

	snprintf(name, sizeof(name), "%llu", sun);

	pci_slot = pci_create_slot(pci_bus, device, name, NULL);

	pci_slot = pci_create_slot(pci_bus, device, name, NULL);

	if (IS_ERR(pci_slot)) {

	if (IS_ERR(pci_slot)) {

		err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));

		pr_err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));

		kfree(slot);

		kfree(slot);

		return AE_OK;

		return AE_OK;

	}

	}
@@ -150,7 +147,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 




	get_device(&pci_bus->dev);

	get_device(&pci_bus->dev);





	dbg("pci_slot: %p, pci_bus: %x, device: %d, name: %s\n",

	dbg("%p, pci_bus: %x, device: %d, name: %s\n",

	    pci_slot, pci_bus->number, device, name);

	    pci_slot, pci_bus->number, device, name);





	return AE_OK;

	return AE_OK;
@@ -186,7 +183,8 @@ void acpi_pci_slot_remove(struct pci_bus *bus) 




static int do_sta_before_sun(const struct dmi_system_id *d)

static int do_sta_before_sun(const struct dmi_system_id *d)

{

{

	info("%s detected: will evaluate _STA before calling _SUN\n", d->ident);

	pr_info("%s detected: will evaluate _STA before calling _SUN\n",

		d->ident);

	check_sta_before_sun = 1;

	check_sta_before_sun = 1;

	return 0;

	return 0;

}

}