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

Commit 93556118 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Remove unnecessary conditional compilation 

ACPICA commit eea1f0e561893b6d6417913b2d224082fe3a0a5e

Remove use of ACPI_DEBUGGER and ACPI_DISASSEMBLER where these
defines are used around entire modules.

Note: This type of code also causes problems with IDEs.

Link: https://github.com/acpica/acpica/commit/eea1f0e5


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 62fcce91

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ acpi-y += \ 
	rsaddr.o	\

	rscalc.o	\

	rscreate.o	\

	rsdump.o	\

	rsdumpinfo.o	\

	rsinfo.o	\

	rsio.o		\
@@ -179,6 +178,7 @@ acpi-y += \ 
	utxfmutex.o



acpi-$(ACPI_FUTURE_USAGE) +=	\

	rsdump.o		\

	utcache.o		\

	utfileio.o		\

	utprint.o		\

drivers/acpi/acpica/acdebug.h

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ 
#ifndef __ACDEBUG_H__

#define __ACDEBUG_H__



/* The debugger is used in conjunction with the disassembler most of time */



#ifdef ACPI_DISASSEMBLER

#include "acdisasm.h"

#endif



#define ACPI_DEBUG_BUFFER_SIZE  0x4000	/* 16K buffer for return objects */



struct acpi_db_command_info {

drivers/acpi/acpica/rsdump.c

+0 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ ACPI_MODULE_NAME("rsdump") 
/*

 * All functions in this module are used by the AML Debugger only

 */

#if defined(ACPI_DEBUGGER)

/* Local prototypes */

static void acpi_rs_out_string(char *title, char *value);
@@ -565,5 +564,3 @@ static void acpi_rs_dump_word_list(u16 length, u16 *data) 
		acpi_os_printf("%25s%2.2X : %4.4X\n", "Word", i, data[i]);

	}

}
 


#endif

include/acpi/platform/acenv.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ 


#ifdef ACPI_LIBRARY

#define ACPI_USE_LOCAL_CACHE

#define ACPI_FUTURE_USAGE

#define ACPI_FULL_DEBUG

#endif



/* Common for all ACPICA applications */