ia64/xen-unstable

changeset 15861:005cd2cba069

Remove dead code in acpi sleep.
Signed-off-by Kevin Tian <kevin.tian@intel.com>
author kfraser@localhost.localdomain
date Mon Sep 10 13:43:19 2007 +0100 (2007-09-10)
parents 1a8f8f96e0cd
children 1474db8058b2
files xen/arch/x86/acpi/power.c
line diff
     1.1 --- a/xen/arch/x86/acpi/power.c	Sat Sep 08 10:06:15 2007 +0100
     1.2 +++ b/xen/arch/x86/acpi/power.c	Mon Sep 10 13:43:19 2007 +0100
     1.3 @@ -181,11 +181,6 @@ static long enter_state_helper(void *dat
     1.4  /*
     1.5   * Dom0 issues this hypercall in place of writing pm1a_cnt. Xen then
     1.6   * takes over the control and put the system into sleep state really.
     1.7 - *
     1.8 - * Guest may issue a two-phases write to PM1x_CNT, to work
     1.9 - * around poorly implemented hardware. It's better to keep
    1.10 - * this logic here. Two writes can be differentiated by 
    1.11 - * enable bit setting.
    1.12   */
    1.13  int acpi_enter_sleep(struct xenpf_enter_acpi_sleep *sleep)
    1.14  {
    1.15 @@ -204,16 +199,6 @@ int acpi_enter_sleep(struct xenpf_enter_
    1.16      if ( sleep->flags )
    1.17          return -EINVAL;
    1.18  
    1.19 -    /* Write #1 */
    1.20 -    if ( !(sleep->pm1a_cnt_val & ACPI_BITMASK_SLEEP_ENABLE) )
    1.21 -    {
    1.22 -        outw((u16)sleep->pm1a_cnt_val, acpi_sinfo.pm1a_cnt);
    1.23 -        if ( acpi_sinfo.pm1b_cnt )
    1.24 -            outw((u16)sleep->pm1b_cnt_val, acpi_sinfo.pm1b_cnt);
    1.25 -        return 0;
    1.26 -    }
    1.27 -
    1.28 -    /* Write #2 */
    1.29      acpi_sinfo.pm1a_cnt_val = sleep->pm1a_cnt_val;
    1.30      acpi_sinfo.pm1b_cnt_val = sleep->pm1b_cnt_val;
    1.31      acpi_sinfo.sleep_state = sleep->sleep_state;