aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2012-07-12 20:57:28 -0400
committerAndres Salomon <dilinger@queued.net>2012-07-31 23:27:30 -0400
commit85f90cf6ca569b19cee212844b543a7355b77163 (patch)
tree1e2cd8e3c712863533f151b033a723443dd31540 /drivers
parentd278b7a2f90f91f908b19b50cfa59e10632b5afc (diff)
x86: OLPC: switch over to using new EC driver on x86
This uses the new EC driver framework in drivers/platform/olpc. The XO-1 and XO-1.5-specific code is still in arch/x86, but the generic stuff (including a new workqueue; no more running EC commands with IRQs disabled!) can be shared with other architectures. Signed-off-by: Andres Salomon <dilinger@queued.net> Acked-by: Paul Fox <pgf@laptop.org> Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/olpc/olpc-ec.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c
index cfba41fb04de..a3d32c2eeb1a 100644
--- a/drivers/platform/olpc/olpc-ec.c
+++ b/drivers/platform/olpc/olpc-ec.c
@@ -113,11 +113,6 @@ int olpc_ec_cmd(u8 cmd, u8 *inbuf, size_t inlen, u8 *outbuf, size_t outlen)
113 struct olpc_ec_priv *ec = ec_priv; 113 struct olpc_ec_priv *ec = ec_priv;
114 struct ec_cmd_desc desc; 114 struct ec_cmd_desc desc;
115 115
116 /* XXX: this will be removed in later patches */
117 /* Are we using old-style callers? */
118 if (!ec_driver || !ec_driver->ec_cmd)
119 return olpc_ec_cmd_x86(cmd, inbuf, inlen, outbuf, outlen);
120
121 /* Ensure a driver and ec hook have been registered */ 116 /* Ensure a driver and ec hook have been registered */
122 if (WARN_ON(!ec_driver || !ec_driver->ec_cmd)) 117 if (WARN_ON(!ec_driver || !ec_driver->ec_cmd))
123 return -ENODEV; 118 return -ENODEV;