ACPICA: Fix deconstification warnings (-Wcast-qual) with function traces. (4857a94d) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/acpi/acpica/acutils.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -317,6 +317,11 @@ acpi_ut_ptr_exit(u32 line_number,
	const char *function_name,		const char *function_name,
	const char module_name, u32 component_id, u8 ptr);		const char module_name, u32 component_id, u8 ptr);

			void
			acpi_ut_str_exit(u32 line_number,
			const char *function_name,
			const char module_name, u32 component_id, const char string);

	void		void
	acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id);		acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id);

+37 −0

Original line number	Original line	Diff line number	Diff line
	@@ -560,6 +560,43 @@ acpi_ut_ptr_exit(u32 line_number,
	}		}
	}		}

			/*******************************************************************************
			*
			* FUNCTION: acpi_ut_str_exit
			*
			* PARAMETERS: line_number - Caller's line number
			* function_name - Caller's procedure name
			* module_name - Caller's module name
			* component_id - Caller's component ID
			* string - String to display
			*
			* RETURN: None
			*
			* DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
			* set in debug_level. Prints exit value also.
			*
			******************************************************************************/

			void
			acpi_ut_str_exit(u32 line_number,
			const char *function_name,
			const char module_name, u32 component_id, const char string)
			{

			/* Check if enabled up-front for performance */

			if (ACPI_IS_DEBUG_ENABLED(ACPI_LV_FUNCTIONS, component_id)) {
			acpi_debug_print(ACPI_LV_FUNCTIONS,
			line_number, function_name, module_name,
			component_id, "%s %s\n",
			acpi_gbl_function_exit_prefix, string);
			}

			if (acpi_gbl_nesting_level) {
			acpi_gbl_nesting_level--;
			}
			}

	/*******************************************************************************		/*******************************************************************************
	*		*
	* FUNCTION: acpi_trace_point		* FUNCTION: acpi_trace_point

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -253,7 +253,7 @@ const char acpi_ut_get_object_type_name(union acpi_operand_object obj_desc)
	return_PTR("Invalid object");		return_PTR("Invalid object");
	}		}

	return_PTR(acpi_ut_get_type_name(obj_desc->common.type));		return_STR(acpi_ut_get_type_name(obj_desc->common.type));
	}		}

	/*******************************************************************************		/*******************************************************************************

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -366,7 +366,7 @@
	ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, u32, value)		ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, u32, value)

	#define ACPI_FUNCTION_TRACE_STR(name, string) \		#define ACPI_FUNCTION_TRACE_STR(name, string) \
	ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, char *, string)		ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, const char *, string)

	#define ACPI_FUNCTION_ENTRY() \		#define ACPI_FUNCTION_ENTRY() \
	acpi_ut_track_stack_ptr()		acpi_ut_track_stack_ptr()
	@@ -425,6 +425,9 @@
	#define return_PTR(pointer) \		#define return_PTR(pointer) \
	ACPI_TRACE_EXIT (acpi_ut_ptr_exit, void *, pointer)		ACPI_TRACE_EXIT (acpi_ut_ptr_exit, void *, pointer)

			#define return_STR(string) \
			ACPI_TRACE_EXIT (acpi_ut_str_exit, const char *, string)

	#define return_VALUE(value) \		#define return_VALUE(value) \
	ACPI_TRACE_EXIT (acpi_ut_value_exit, u64, value)		ACPI_TRACE_EXIT (acpi_ut_value_exit, u64, value)

	@@ -478,6 +481,7 @@
	#define return_VOID return		#define return_VOID return
	#define return_ACPI_STATUS(s) return(s)		#define return_ACPI_STATUS(s) return(s)
	#define return_PTR(s) return(s)		#define return_PTR(s) return(s)
			#define return_STR(s) return(s)
	#define return_VALUE(s) return(s)		#define return_VALUE(s) return(s)
	#define return_UINT8(s) return(s)		#define return_UINT8(s) return(s)
	#define return_UINT32(s) return(s)		#define return_UINT32(s) return(s)