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

Commit aad20cab authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Greg Kroah-Hartman
Browse files

[PATCH] acpi_pcihp: Remove improper error message about OSHP 



This patch converts the improper error message about OSHP evaluation
to debug message which is displayed only when pci_hotplug.ko is loaded
with debugging mode enabled. To do this, this patch adds a new module
parameter "debug_acpi" to pci_hotplug.ko for enabling/disabling debug
messages in acpi_pcihp.c.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Cc: Kristen Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7430e34c

drivers/pci/hotplug/acpi_pcihp.c

+19 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
 */



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/pci.h>
@@ -33,10 +34,19 @@ 
#include <acpi/actypes.h>

#include "pci_hotplug.h"



#define MY_NAME	"acpi_pcihp"



#define dbg(fmt, arg...) do { if (debug_acpi) printk(KERN_DEBUG "%s: %s: " fmt , MY_NAME , __FUNCTION__ , ## arg); } while (0)

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

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

#define warn(format, arg...) printk(KERN_WARNING "%s: " format , MY_NAME , ## arg)



#define	METHOD_NAME__SUN	"_SUN"

#define	METHOD_NAME__HPP	"_HPP"

#define	METHOD_NAME_OSHP	"OSHP"



static int debug_acpi;





static acpi_status

acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
@@ -130,8 +140,12 @@ acpi_status acpi_run_oshp(acpi_handle handle) 
	/* run OSHP */

	status = acpi_evaluate_object(handle, METHOD_NAME_OSHP, NULL, NULL);

	if (ACPI_FAILURE(status))

		printk(KERN_ERR "%s:%s OSHP fails=0x%x\n", __FUNCTION__,

			(char *)string.pointer, status);

		if (status != AE_NOT_FOUND)

			printk(KERN_ERR "%s:%s OSHP fails=0x%x\n",

			       __FUNCTION__, (char *)string.pointer, status);

		else

			dbg("%s:%s OSHP not found\n",

			    __FUNCTION__, (char *)string.pointer);

	else

		pr_debug("%s:%s OSHP passes\n", __FUNCTION__,

			(char *)string.pointer);
@@ -223,3 +237,6 @@ int acpi_root_bridge(acpi_handle handle) 
	return 0;

}

EXPORT_SYMBOL_GPL(acpi_root_bridge);



module_param(debug_acpi, bool, 0644);

MODULE_PARM_DESC(debug_acpi, "Debugging mode for ACPI enabled or not");