Re: [PATCH v2, part 1 6/9] ACPI, pci_root: use acpi_handle_print() and pr_xxx() to print messages

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 05/14/2013 07:27 AM, Rafael J. Wysocki wrote:
On Tuesday, May 14, 2013 12:08:30 AM Jiang Liu wrote:
Use acpi_handle_print() and pr_xxx() to print messages in pci_root.c.

Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
Cc: linux-acpi@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
---
  drivers/acpi/pci_root.c | 71 ++++++++++++++++++++++---------------------------
  1 file changed, 32 insertions(+), 39 deletions(-)

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 91ddfd6..9ced5c3 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -379,23 +379,23 @@ static int acpi_pci_root_add(struct acpi_device *device,
  	struct acpi_pci_root *root;
  	u32 flags, base_flags;
  	bool is_osc_granted = false;
+	acpi_handle hdl = device->handle;
The usual way is to call it 'handle'.  Any reason why not to do it here
Hi Rafael,
Just to avoid splitting some code into two lines, I could to use "handle"
if preferred.
  	root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL);
  	if (!root)
  		return -ENOMEM;
segment = 0;
-	status = acpi_evaluate_integer(device->handle, METHOD_NAME__SEG, NULL,
-				       &segment);
+	status = acpi_evaluate_integer(hdl, METHOD_NAME__SEG, NULL, &segment);
  	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
-		printk(KERN_ERR PREFIX "can't evaluate _SEG\n");
+		acpi_handle_err(hdl, "can't evaluate _SEG\n");
  		result = -ENODEV;
  		goto end;
  	}
/* Check _CRS first, then _BBN. If no _BBN, default to zero. */
  	root->secondary.flags = IORESOURCE_BUS;
-	status = try_get_root_bridge_busnr(device->handle, &root->secondary);
+	status = try_get_root_bridge_busnr(hdl, &root->secondary);
  	if (ACPI_FAILURE(status)) {
  		/*
  		 * We need both the start and end of the downstream bus range
@@ -404,16 +404,16 @@ static int acpi_pci_root_add(struct acpi_device *device,
  		 * can do is assume [_BBN-0xFF] or [0-0xFF].
  		 */
  		root->secondary.end = 0xFF;
-		printk(KERN_WARNING FW_BUG PREFIX
-		       "no secondary bus range in _CRS\n");
-		status = acpi_evaluate_integer(device->handle, METHOD_NAME__BBN,
+		acpi_handle_warn(hdl,
+				 FW_BUG "no secondary bus range in _CRS\n");
+		status = acpi_evaluate_integer(hdl, METHOD_NAME__BBN,
  					       NULL, &bus);
  		if (ACPI_SUCCESS(status))
  			root->secondary.start = bus;
  		else if (status == AE_NOT_FOUND)
  			root->secondary.start = 0;
  		else {
-			printk(KERN_ERR PREFIX "can't evaluate _BBN\n");
+			acpi_handle_err(hdl, "can't evaluate _BBN\n");
  			result = -ENODEV;
  			goto end;
  		}
@@ -425,11 +425,11 @@ static int acpi_pci_root_add(struct acpi_device *device,
  	strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS);
  	device->driver_data = root;
- printk(KERN_INFO PREFIX "%s [%s] (domain %04x %pR)\n",
+	pr_info(PREFIX "%s [%s] (domain %04x %pR)\n",
  	       acpi_device_name(device), acpi_device_bid(device),
  	       root->segment, &root->secondary);
- root->mcfg_addr = acpi_pci_root_get_mcfg_addr(device->handle);
+	root->mcfg_addr = acpi_pci_root_get_mcfg_addr(hdl);
/*
  	 * All supported architectures that use ACPI have support for
@@ -473,7 +473,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
  		dev_info(&device->dev,
  			"Requesting ACPI _OSC control (0x%02x)\n", flags);
- status = acpi_pci_osc_control_set(device->handle, &flags,
+		status = acpi_pci_osc_control_set(hdl, &flags,
  				       OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
  		if (ACPI_SUCCESS(status)) {
  			is_osc_granted = true;
@@ -505,9 +505,9 @@ static int acpi_pci_root_add(struct acpi_device *device,
  	 */
  	root->bus = pci_acpi_scan_root(root);
  	if (!root->bus) {
-		printk(KERN_ERR PREFIX
-			    "Bus %04x:%02x not present in PCI namespace\n",
-			    root->segment, (unsigned int)root->secondary.start);
+		acpi_handle_err(hdl,
+			"Bus %04x:%02x not present in PCI namespace\n",
+			root->segment, (unsigned int)root->secondary.start);
  		result = -ENODEV;
  		goto end;
  	}
@@ -517,8 +517,8 @@ static int acpi_pci_root_add(struct acpi_device *device,
  		if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM)
  			pcie_clear_aspm(root->bus);
  	} else {
-		pr_info("ACPI _OSC control for PCIe not granted, "
-			"disabling ASPM\n");
+		acpi_handle_info(hdl,
+			"ACPI _OSC control for PCIe not granted, disabling ASPM\n");
  		pcie_no_aspm();
  	}
@@ -571,12 +571,13 @@ static void handle_root_bridge_insertion(acpi_handle handle)
  	struct acpi_device *device;
if (!acpi_bus_get_device(handle, &device)) {
-		printk(KERN_DEBUG "acpi device exists...\n");
+		acpi_handle_printk(KERN_DEBUG, handle,
+				   "acpi device exists...\n");
Do we have acpi_handle_dbg()?  If so, why don't you use it here? (And below.)
If not, why don't you add it and use it here (and below)?
acpi_handle_dbg() only generates message if CONFIG_DEBUG is enabled,
so use pci_handle_printk(KERN_DEBUG, xxx) to keep original behavior.
Thanks,
Gerry

  		return;
  	}
if (acpi_bus_scan(handle))
-		printk(KERN_ERR "cannot add bridge to acpi list\n");
+		acpi_handle_err(handle, "cannot add bridge to acpi list\n");
  }
static void handle_root_bridge_removal(struct acpi_device *device)
@@ -602,7 +603,6 @@ static void handle_root_bridge_removal(struct acpi_device *device)
  static void _handle_hotplug_event_root(struct work_struct *work)
  {
  	struct acpi_pci_root *root;
-	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER };
  	struct acpi_hp_work *hp_work;
  	acpi_handle handle;
  	u32 type;
@@ -613,13 +613,11 @@ static void _handle_hotplug_event_root(struct work_struct *work)
root = acpi_pci_find_root(handle); - acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
-
  	switch (type) {
  	case ACPI_NOTIFY_BUS_CHECK:
  		/* bus enumerate */
-		printk(KERN_DEBUG "%s: Bus check notify on %s\n", __func__,
-				 (char *)buffer.pointer);
+		acpi_handle_printk(KERN_DEBUG, handle,
+				   "Bus check notify on %s\n", __func__);
  		if (!root)
  			handle_root_bridge_insertion(handle);
@@ -627,27 +625,26 @@ static void _handle_hotplug_event_root(struct work_struct *work) case ACPI_NOTIFY_DEVICE_CHECK:
  		/* device check */
-		printk(KERN_DEBUG "%s: Device check notify on %s\n", __func__,
-				 (char *)buffer.pointer);
+		acpi_handle_printk(KERN_DEBUG, handle,
+				   "Device check notify on %s\n", __func__);
  		if (!root)
  			handle_root_bridge_insertion(handle);
  		break;
case ACPI_NOTIFY_EJECT_REQUEST:
  		/* request device eject */
-		printk(KERN_DEBUG "%s: Device eject notify on %s\n", __func__,
-				 (char *)buffer.pointer);
+		acpi_handle_printk(KERN_DEBUG, handle,
+				   "Device eject notify on %s\n", __func__);
  		if (root)
  			handle_root_bridge_removal(root->device);
  		break;
  	default:
-		printk(KERN_WARNING "notify_handler: unknown event type 0x%x for %s\n",
-				 type, (char *)buffer.pointer);
+		acpi_handle_warn(handle,
+			 "notify_handler: unknown event type 0x%xn", type);
  		break;
  	}
kfree(hp_work); /* allocated in handle_hotplug_event_bridge */
-	kfree(buffer.pointer);
  }
static void handle_hotplug_event_root(acpi_handle handle, u32 type,
@@ -661,9 +658,6 @@ static acpi_status __init
  find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
  {
  	acpi_status status;
-	char objname[64];
-	struct acpi_buffer buffer = { .length = sizeof(objname),
-				      .pointer = objname };
  	int *count = (int *)context;
if (!acpi_is_root_bridge(handle))
@@ -671,16 +665,15 @@ find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
(*count)++; - acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
-
  	status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
  					handle_hotplug_event_root, NULL);
  	if (ACPI_FAILURE(status))
-		printk(KERN_DEBUG "acpi root: %s notify handler is not installed, exit status: %u\n",
-				  objname, (unsigned int)status);
+		acpi_handle_printk(KERN_DEBUG, handle,
+			"notify handler is not installed, exit status: %u\n",
+			 (unsigned int)status);
  	else
-		printk(KERN_DEBUG "acpi root: %s notify handler is installed\n",
-				 objname);
+		acpi_handle_printk(KERN_DEBUG, handle,
+				   "notify handler is installed\n");
return AE_OK;
  }
Thanks,
Rafael



--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux IBM ACPI]     [Linux Power Management]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux