summaryrefslogtreecommitdiff
path: root/common/cros_ec.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-03-26 09:29:32 -0600
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:15 -0600
commit60f37fc6aaece8dcf0241435d42b0580c93c7b91 (patch)
treee49749dcd01b2b8479059f6c45eb7c415a9c1cfa /common/cros_ec.c
parente96fc7dfc835b282521c2a661a479f0563c653b5 (diff)
downloadu-boot-60f37fc6aaece8dcf0241435d42b0580c93c7b91.tar.gz
cros_ec: Drop unused CONFIG_DM_CROS_EC
Since all supported boards enable this option now, we can remove it along with the old code. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cros_ec.c')
-rw-r--r--common/cros_ec.c30
1 files changed, 1 insertions, 29 deletions
diff --git a/common/cros_ec.c b/common/cros_ec.c
index 64b46796ef..f9c74ca0b9 100644
--- a/common/cros_ec.c
+++ b/common/cros_ec.c
@@ -15,18 +15,8 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifndef CONFIG_DM_CROS_EC
-struct local_info {
- struct cros_ec_dev *cros_ec_dev; /* Pointer to cros_ec device */
- int cros_ec_err; /* Error for cros_ec, 0 if ok */
-};
-
-static struct local_info local;
-#endif
-
struct cros_ec_dev *board_get_cros_ec_dev(void)
{
-#ifdef CONFIG_DM_CROS_EC
struct udevice *dev;
int ret;
@@ -36,30 +26,15 @@ struct cros_ec_dev *board_get_cros_ec_dev(void)
return NULL;
}
return dev_get_uclass_priv(dev);
-#else
- return local.cros_ec_dev;
-#endif
-}
-
-static int board_init_cros_ec_devices(const void *blob)
-{
-#ifndef CONFIG_DM_CROS_EC
- local.cros_ec_err = cros_ec_init(blob, &local.cros_ec_dev);
- if (local.cros_ec_err)
- return -1; /* Will report in board_late_init() */
-#endif
-
- return 0;
}
int cros_ec_board_init(void)
{
- return board_init_cros_ec_devices(gd->fdt_blob);
+ return 0;
}
int cros_ec_get_error(void)
{
-#ifdef CONFIG_DM_CROS_EC
struct udevice *dev;
int ret;
@@ -68,7 +43,4 @@ int cros_ec_get_error(void)
return ret;
return 0;
-#else
- return local.cros_ec_err;
-#endif
}