leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: acpiphp: merge acpiphp_debug and debug

Browse Source 
Should not have two, just remove debug, and use module_param_named
instead.

Also change acpiphp_debug to bool.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Yinghai Lu 2012-06-23 00:42:03 -07:00 committed by Bjorn Helgaas
parent e735a80bd5
commit 2ac45f28b8
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/hotplug/acpiphp.h
View File

@ -205,6 +205,6 @@ extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot);
extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot); extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);
/* variables */ /* variables */
extern int acpiphp_debug; extern bool acpiphp_debug;
#endif /* _ACPIPHP_H */ #endif /* _ACPIPHP_H */

7
drivers/pci/hotplug/acpiphp_core.c
View File

@ -47,8 +47,7 @@
/* name size which is used for entries in pcihpfs */ /* name size which is used for entries in pcihpfs */
#define SLOT_NAME_SIZE 21 /* {_SUN} */ #define SLOT_NAME_SIZE 21 /* {_SUN} */
static bool debug; bool acpiphp_debug;
int acpiphp_debug;
/* local variables */ /* local variables */
static int num_slots; static int num_slots;
@ -62,7 +61,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_PARM_DESC(debug, "Debugging mode enabled or not"); 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 the attention callback registration methods */
EXPORT_SYMBOL_GPL(acpiphp_register_attention); EXPORT_SYMBOL_GPL(acpiphp_register_attention);
@ -379,8 +378,6 @@ static int __init acpiphp_init(void)
if (acpi_pci_disabled) if (acpi_pci_disabled)
return 0; return 0;
acpiphp_debug = debug;
/* read all the ACPI info from the system */ /* read all the ACPI info from the system */
return init_acpi(); return init_acpi();
} }