aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/evhandler.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 06:58:14 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 06:58:14 -0400
commit80338681bbc5786fa1342d3b7f021c1d8974ac62 (patch)
tree90cdacbab0695fcb8b0f5ad9f484e5a5f6751ecf /drivers/acpi/acpica/evhandler.c
parenta204dbc61b7f4cb1a7e2cb3ad057b135164782da (diff)
parent069189a1c8e897be8c9d8f2365c30a6497100519 (diff)
Merge branch 'acpica'
* acpica: (21 commits) ACPICA: Update version to 20130517 ACPICA: _CST repair: Handle null package entries ACPICA: Add several repairs for _CST predefined name ACPICA: Move _PRT repair into the standard complex repair module ACPICA: Clear events initialized flag upon event component termination ACPICA: Fix possible memory leak in GPE init error path ACPICA: ACPICA Termination: Delete global lock pending lock ACPICA: Update interface to acpi_ut_valid_acpi_name() ACPICA: Do not use extended sleep registers unless HW-reduced bit is set ACPICA: Split table print utilities to a new a separate file ACPICA: Add option to disable loading of SSDTs from the RSDT/XSDT ACPICA: Standardize all switch() blocks ACPICA: Split internal error msg routines to a separate file ACPICA: Split buffer dump routines into separate file ACPICA: Update version to 20130418 ACPICA: Update for "orphan" embedded controller _REG method support ACPICA: Remove unused macros, no functional change ACPICA: Predefined name support: Remove unused local variable ACPICA: Add argument typechecking for all predefined ACPI names ACPICA: Add BIOS error interface for predefined name validation support ...
Diffstat (limited to 'drivers/acpi/acpica/evhandler.c')
-rw-r--r--drivers/acpi/acpica/evhandler.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/evhandler.c b/drivers/acpi/acpica/evhandler.c
index d4f83112c2e2..068af96134b8 100644
--- a/drivers/acpi/acpica/evhandler.c
+++ b/drivers/acpi/acpica/evhandler.c
@@ -354,36 +354,43 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
354 354
355 switch (space_id) { 355 switch (space_id) {
356 case ACPI_ADR_SPACE_SYSTEM_MEMORY: 356 case ACPI_ADR_SPACE_SYSTEM_MEMORY:
357
357 handler = acpi_ex_system_memory_space_handler; 358 handler = acpi_ex_system_memory_space_handler;
358 setup = acpi_ev_system_memory_region_setup; 359 setup = acpi_ev_system_memory_region_setup;
359 break; 360 break;
360 361
361 case ACPI_ADR_SPACE_SYSTEM_IO: 362 case ACPI_ADR_SPACE_SYSTEM_IO:
363
362 handler = acpi_ex_system_io_space_handler; 364 handler = acpi_ex_system_io_space_handler;
363 setup = acpi_ev_io_space_region_setup; 365 setup = acpi_ev_io_space_region_setup;
364 break; 366 break;
365 367
366 case ACPI_ADR_SPACE_PCI_CONFIG: 368 case ACPI_ADR_SPACE_PCI_CONFIG:
369
367 handler = acpi_ex_pci_config_space_handler; 370 handler = acpi_ex_pci_config_space_handler;
368 setup = acpi_ev_pci_config_region_setup; 371 setup = acpi_ev_pci_config_region_setup;
369 break; 372 break;
370 373
371 case ACPI_ADR_SPACE_CMOS: 374 case ACPI_ADR_SPACE_CMOS:
375
372 handler = acpi_ex_cmos_space_handler; 376 handler = acpi_ex_cmos_space_handler;
373 setup = acpi_ev_cmos_region_setup; 377 setup = acpi_ev_cmos_region_setup;
374 break; 378 break;
375 379
376 case ACPI_ADR_SPACE_PCI_BAR_TARGET: 380 case ACPI_ADR_SPACE_PCI_BAR_TARGET:
381
377 handler = acpi_ex_pci_bar_space_handler; 382 handler = acpi_ex_pci_bar_space_handler;
378 setup = acpi_ev_pci_bar_region_setup; 383 setup = acpi_ev_pci_bar_region_setup;
379 break; 384 break;
380 385
381 case ACPI_ADR_SPACE_DATA_TABLE: 386 case ACPI_ADR_SPACE_DATA_TABLE:
387
382 handler = acpi_ex_data_table_space_handler; 388 handler = acpi_ex_data_table_space_handler;
383 setup = NULL; 389 setup = NULL;
384 break; 390 break;
385 391
386 default: 392 default:
393
387 status = AE_BAD_PARAMETER; 394 status = AE_BAD_PARAMETER;
388 goto unlock_and_exit; 395 goto unlock_and_exit;
389 } 396 }