Commit bd23fac3 authored by Sinan Kaya's avatar Sinan Kaya Committed by Rafael J. Wysocki
Browse files

ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset 



Allow ACPI to be built without PCI support in place.

Signed-off-by: default avatarSinan Kaya <okaya@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 86689776

drivers/acpi/acpica/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -77,13 +77,13 @@ acpi-y += \ 
	hwacpi.o	\

	hwesleep.o	\

	hwgpe.o		\

	hwpci.o		\

	hwregs.o	\

	hwsleep.o	\

	hwvalid.o	\

	hwxface.o	\

	hwxfsleep.o



acpi-$(CONFIG_PCI) += hwpci.o

acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o



acpi-y +=		\

drivers/acpi/acpica/achware.h

+9 −0
Original line number Diff line number Diff line
@@ -106,11 +106,20 @@ acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
				 struct acpi_gpe_block_info *gpe_block,

				 void *context);



#ifdef ACPI_PCI_CONFIGURED

/*

 * hwpci - PCI configuration support

 */

acpi_status

acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,

		      acpi_handle root_pci_device, acpi_handle pci_region);

#else

static inline acpi_status

acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id, acpi_handle root_pci_device,

		      acpi_handle pci_region)

{

	return AE_SUPPORT;

}

#endif



#endif				/* __ACHWARE_H__ */

drivers/acpi/acpica/evhandler.c

+4 −4
Original line number Diff line number Diff line
@@ -364,25 +364,25 @@ acpi_ev_install_space_handler(struct acpi_namespace_node *node, 
			handler = acpi_ex_system_io_space_handler;

			setup = acpi_ev_io_space_region_setup;

			break;



#ifdef ACPI_PCI_CONFIGURED

		case ACPI_ADR_SPACE_PCI_CONFIG:



			handler = acpi_ex_pci_config_space_handler;

			setup = acpi_ev_pci_config_region_setup;

			break;



#endif

		case ACPI_ADR_SPACE_CMOS:



			handler = acpi_ex_cmos_space_handler;

			setup = acpi_ev_cmos_region_setup;

			break;



#ifdef ACPI_PCI_CONFIGURED

		case ACPI_ADR_SPACE_PCI_BAR_TARGET:



			handler = acpi_ex_pci_bar_space_handler;

			setup = acpi_ev_pci_bar_region_setup;

			break;



#endif

		case ACPI_ADR_SPACE_DATA_TABLE:



			handler = acpi_ex_data_table_space_handler;

drivers/acpi/acpica/exregion.c

+4 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ acpi_ex_system_io_space_handler(u32 function, 
	return_ACPI_STATUS(status);

}



#ifdef ACPI_PCI_CONFIGURED

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

 *

 * FUNCTION:    acpi_ex_pci_config_space_handler
@@ -387,6 +388,7 @@ acpi_ex_pci_config_space_handler(u32 function, 


	return_ACPI_STATUS(status);

}

#endif



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

 *
@@ -420,6 +422,7 @@ acpi_ex_cmos_space_handler(u32 function, 
	return_ACPI_STATUS(status);

}



#ifdef ACPI_PCI_CONFIGURED

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

 *

 * FUNCTION:    acpi_ex_pci_bar_space_handler
@@ -451,6 +454,7 @@ acpi_ex_pci_bar_space_handler(u32 function, 


	return_ACPI_STATUS(status);

}

#endif



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

 *

drivers/acpi/osl.c

+2 −0
Original line number Diff line number Diff line
@@ -769,6 +769,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u64 value, u32 width) 
	return AE_OK;

}



#ifdef CONFIG_PCI

acpi_status

acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,

			       u64 *value, u32 width)
@@ -827,6 +828,7 @@ acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, 


	return (result ? AE_ERROR : AE_OK);

}

#endif



static void acpi_os_execute_deferred(struct work_struct *work)

{