diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-11 12:26:40 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-07-11 12:26:40 -0600 |
| commit | 7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed (patch) | |
| tree | f8ce42e62b68b03ae90594830e58390930e8d780 /drivers/pci/hotplug/acpiphp_core.c | |
| parent | 6ee53f4c38e70ba34777ad38807a50c1812ff36f (diff) | |
| parent | 2ac45f28b8eeef576c48579833b40b572f3f9790 (diff) | |
Merge branch 'pci/yinghai-hotplug-cleanup' into next
* pci/yinghai-hotplug-cleanup:
PCI: acpiphp: merge acpiphp_debug and debug
PCI: acpiphp: remove unused res_lock
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_core.c')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c index aa41631e9e0..96316b74969 100644 --- a/drivers/pci/hotplug/acpiphp_core.c +++ b/drivers/pci/hotplug/acpiphp_core.c @@ -47,8 +47,7 @@ /* name size which is used for entries in pcihpfs */ #define SLOT_NAME_SIZE 21 /* {_SUN} */ -static bool debug; -int acpiphp_debug; +bool acpiphp_debug; /* local variables */ static int num_slots; @@ -62,7 +61,7 @@ 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); +module_param_named(debug, acpiphp_debug, bool, 0644); /* export the attention callback registration methods */ EXPORT_SYMBOL_GPL(acpiphp_register_attention); @@ -379,8 +378,6 @@ static int __init acpiphp_init(void) if (acpi_pci_disabled) return 0; - acpiphp_debug = debug; - /* read all the ACPI info from the system */ return init_acpi(); } |