convert acpi_path_name() callers (v2)

@@ -38,21 +38,6 @@
 #define	METHOD_NAME__HPP	"_HPP"
 #define	METHOD_NAME_OSHP	"OSHP"
 
-static u8 * acpi_path_name( acpi_handle	handle)
-{
-	acpi_status		status;
-	static u8		path_name[ACPI_PATHNAME_MAX];
-	struct acpi_buffer	ret_buf = { ACPI_PATHNAME_MAX, path_name };
-
-	memset(path_name, 0, sizeof (path_name));
-	status = acpi_get_name(handle, ACPI_FULL_PATHNAME, &ret_buf);
-
-	if (ACPI_FAILURE(status))
-		return NULL;
-	else
-		return path_name;	
-}
-
 static acpi_status
 acpi_run_hpp(acpi_handle handle, struct hotplug_params *hpp)
 {

@@ -60,8 +45,11 @@ acpi_run_hpp(acpi_handle handle, struct 
 	u8			nui[4];
 	struct acpi_buffer	ret_buf = { 0, NULL};
 	union acpi_object	*ext_obj, *package;
-	u8			*path_name = acpi_path_name(handle);
 	int			i, len = 0;
+	struct acpi_buffer	namebuf = {ACPI_ALLOCATE_BUFFER, NULL};
+	char			*pathname = namebuf.pointer;
+
+	acpi_path_name(handle, &namebuf);
 
 	/* get _hpp */
 	status = acpi_evaluate_object(handle, METHOD_NAME__HPP, NULL, &ret_buf);

@@ -70,7 +58,8 @@ acpi_run_hpp(acpi_handle handle, struct 
 		ret_buf.pointer = kmalloc (ret_buf.length, GFP_KERNEL);
 		if (!ret_buf.pointer) {
 			err ("%s:%s alloc for _HPP fail\n", __FUNCTION__,
-					path_name);
+					pathname);
+			acpi_os_free(namebuf.pointer);
 			return AE_NO_MEMORY;
 		}
 		status = acpi_evaluate_object(handle, METHOD_NAME__HPP,

@@ -80,7 +69,8 @@ acpi_run_hpp(acpi_handle handle, struct 
 	default:
 		if (ACPI_FAILURE(status)) {
 			dbg("%s:%s _HPP fail=0x%x\n", __FUNCTION__,
-					path_name, status);
+					pathname, status);
+			acpi_os_free(namebuf.pointer);
 			return status;
 		}
 	}

@@ -88,7 +78,7 @@ acpi_run_hpp(acpi_handle handle, struct 
 	ext_obj = (union acpi_object *) ret_buf.pointer;
 	if (ext_obj->type != ACPI_TYPE_PACKAGE) {
 		err ("%s:%s _HPP obj not a package\n", __FUNCTION__,
-				path_name);
+				pathname);
 		status = AE_ERROR;
 		goto free_and_return;
 	}

@@ -103,7 +93,7 @@ acpi_run_hpp(acpi_handle handle, struct 
 			break;
 		default:
 			err ("%s:%s _HPP obj type incorrect\n", __FUNCTION__,
-					path_name);
+					pathname);
 			status = AE_ERROR;
 			goto free_and_return;
 		}

@@ -120,23 +110,28 @@ acpi_run_hpp(acpi_handle handle, struct 
 	dbg("  _HPP: enable PERR    =0x%x\n", hpp->enable_perr);
 
 free_and_return:
-	kfree(ret_buf.pointer);
+	acpi_os_free(ret_buf.pointer);
+	acpi_os_free(namebuf.pointer);
 	return status;
 }
 
 static acpi_status acpi_run_oshp(acpi_handle handle)
 {
 	acpi_status		status;
-	u8			*path_name = acpi_path_name(handle);
+	struct acpi_buffer	namebuf = {ACPI_ALLOCATE_BUFFER, NULL};
+	char			*pathname = namebuf.pointer;
+
+	acpi_path_name(handle, &namebuf);
 
 	/* run OSHP */
 	status = acpi_evaluate_object(handle, METHOD_NAME_OSHP, NULL, NULL);
 	if (ACPI_FAILURE(status)) {
-		dbg("%s:%s OSHP fails=0x%x\n", __FUNCTION__, path_name,
+		dbg("%s:%s OSHP fails=0x%x\n", __FUNCTION__, pathname,
 				status);
 	} else {
-		dbg("%s:%s OSHP passes\n", __FUNCTION__, path_name);
+		dbg("%s:%s OSHP passes\n", __FUNCTION__, pathname);
 	}
+	acpi_os_free(namebuf.pointer);
 	return status;
 }
 

@@ -174,7 +169,10 @@ int pciehp_get_hp_hw_control_from_firmwa
 	acpi_status status;
 	acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
 	struct pci_dev *pdev = dev;
-	u8 *path_name;
+	struct acpi_buffer	namebuf = {ACPI_ALLOCATE_BUFFER, NULL};
+	acpi_status		namests;
+	char			*pathname = namebuf.pointer;
+
 	/*
 	 * Per PCI firmware specification, we should run the ACPI _OSC
 	 * method to get control of hotplug hardware before using it.

@@ -204,17 +202,19 @@ int pciehp_get_hp_hw_control_from_firmwa
 	}
 
 	while (handle) {
-		path_name = acpi_path_name(handle);
-		dbg("Trying to get hotplug control for %s \n", path_name);
+		namests = acpi_path_name(handle, &namebuf);
+		dbg("Trying to get hotplug control for %s\n", pathname);
 		status = pci_osc_control_set(handle,
 				OSC_PCI_EXPRESS_NATIVE_HP_CONTROL);
 		if (status == AE_NOT_FOUND)
 			status = acpi_run_oshp(handle);
 		if (ACPI_SUCCESS(status)) {
 			dbg("Gained control for hotplug HW for pci %s (%s)\n",
-				pci_name(dev), path_name);
+				pci_name(dev), pathname);
+			acpi_os_free(namebuf.pointer);
 			return 0;
 		}
+		acpi_os_free(namebuf.pointer);
 		if (is_root_bridge(handle))
 			break;
 		chandle = handle;

99 lines not on this page · raw message