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

Commit 2ac45f28 authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

PCI: acpiphp: merge acpiphp_debug and debug 



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

Also change acpiphp_debug to bool.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e735a80b

drivers/pci/hotplug/acpiphp.h

+1 −1
Original line number Diff line number Diff line
@@ -205,6 +205,6 @@ extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot); 
extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);



/* variables */

extern int acpiphp_debug;

extern bool acpiphp_debug;



#endif /* _ACPIPHP_H */

drivers/pci/hotplug/acpiphp_core.c

+2 −5
Original line number Diff line number Diff line
@@ -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();

}