1 files changed, 1 insertions, 15 deletions

diff --git a/arch/x86/platform/olpc/olpc-xo1-pm.c b/arch/x86/platform/olpc/olpc-xo1-pm.c
index 0ce8616c88ae..d75582d1aa55 100644
--- a/arch/x86/platform/olpc/olpc-xo1-pm.c
+++ b/arch/x86/platform/olpc/olpc-xo1-pm.c
@@ -18,6 +18,7 @@
 #include <linux/pm.h>
 #include <linux/mfd/core.h>
 #include <linux/suspend.h>
+#include <linux/olpc-ec.h>
 
 #include <asm/io.h>
 #include <asm/olpc.h>
@@ -51,16 +52,11 @@ EXPORT_SYMBOL_GPL(olpc_xo1_pm_wakeup_clear);
 static int xo1_power_state_enter(suspend_state_t pm_state)
 {
         unsigned long saved_sci_mask;
-        int r;
 
         /* Only STR is supported */
         if (pm_state != PM_SUSPEND_MEM)
                 return -EINVAL;
 
-        r = olpc_ec_cmd(EC_SET_SCI_INHIBIT, NULL, 0, NULL, 0);
-        if (r)
-                return r;
-
         /*
          * Save SCI mask (this gets lost since PM1_EN is used as a mask for
          * wakeup events, which is not necessarily the same event set)
@@ -76,16 +72,6 @@ static int xo1_power_state_enter(suspend_state_t pm_state)
         /* Restore SCI mask (using dword access to CS5536_PM1_EN) */
         outl(saved_sci_mask, acpi_base + CS5536_PM1_STS);
 
-        /* Tell the EC to stop inhibiting SCIs */
-        olpc_ec_cmd(EC_SET_SCI_INHIBIT_RELEASE, NULL, 0, NULL, 0);
-
-        /*
-         * Tell the wireless module to restart USB communication.
-         * Must be done twice.
-         */
-        olpc_ec_cmd(EC_WAKE_UP_WLAN, NULL, 0, NULL, 0);
-        olpc_ec_cmd(EC_WAKE_UP_WLAN, NULL, 0, NULL, 0);
-
         return 0;
 }