Skip to content

Commit

Permalink
ACPI / PCI: pci_slot: Use generic pr_debug utility
Browse files Browse the repository at this point in the history
Remove the dbg macro and debug module parameter and use
the generic kernel facility.

Trivially reduces defconfig object size on x86-64

$ size drivers/acpi/pci_slot.o*
   text	   data	    bss	    dec	    hex	filename
    880	    752	      4	   1636	    664	drivers/acpi/pci_slot.o.new
    935	    752	      5	   1692	    69c	drivers/acpi/pci_slot.o.old

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Joe Perches authored and Rafael J. Wysocki committed Jun 22, 2016
1 parent 2cfd93d commit 409ffed
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions drivers/acpi/pci_slot.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include <linux/dmi.h>
#include <linux/pci-acpi.h>

static bool debug;
static int check_sta_before_sun;

#define DRIVER_VERSION "0.1"
Expand All @@ -44,18 +43,10 @@ static int check_sta_before_sun;
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
module_param(debug, bool, 0644);

#define _COMPONENT ACPI_PCI_COMPONENT
ACPI_MODULE_NAME("pci_slot");

#define dbg(fmt, ...) \
do { \
if (debug) \
pr_debug(fmt, ##__VA_ARGS__); \
} while (0)

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

struct acpi_pci_slot {
Expand All @@ -75,7 +66,7 @@ check_slot(acpi_handle handle, unsigned long long *sun)
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
dbg("Checking slot on path: %s\n", (char *)buffer.pointer);
pr_debug("Checking slot on path: %s\n", (char *)buffer.pointer);

if (check_sta_before_sun) {
/* If SxFy doesn't have _STA, we just assume it's there */
Expand All @@ -86,14 +77,16 @@ check_slot(acpi_handle handle, unsigned long long *sun)

status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
if (ACPI_FAILURE(status)) {
dbg("_ADR returned %d on %s\n", status, (char *)buffer.pointer);
pr_debug("_ADR returned %d on %s\n",
status, (char *)buffer.pointer);
goto out;
}

/* No _SUN == not a slot == bail */
status = acpi_evaluate_integer(handle, "_SUN", NULL, sun);
if (ACPI_FAILURE(status)) {
dbg("_SUN returned %d on %s\n", status, (char *)buffer.pointer);
pr_debug("_SUN returned %d on %s\n",
status, (char *)buffer.pointer);
goto out;
}

Expand Down Expand Up @@ -147,8 +140,8 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)

get_device(&pci_bus->dev);

dbg("%p, pci_bus: %x, device: %d, name: %s\n",
pci_slot, pci_bus->number, device, name);
pr_debug("%p, pci_bus: %x, device: %d, name: %s\n",
pci_slot, pci_bus->number, device, name);

return AE_OK;
}
Expand Down

0 comments on commit 409ffed

Please sign in to comment.