X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fcros_ec.c;h=e66471ebd1b257ce7049b2ec579c1d339abed8af;hb=2fc91ed3baf39cca548107b03b3a9ac4fb0b47f6;hp=64b46796eff5d40f5a371ae0a5ea221611e87e58;hpb=e564f054af002d9e6a1080ed9d4bc2c6052a4435;p=oweals%2Fu-boot.git

diff --git a/common/cros_ec.c b/common/cros_ec.c
index 64b46796ef..e66471ebd1 100644
--- a/common/cros_ec.c
+++ b/common/cros_ec.c
@@ -13,20 +13,8 @@
 #include <dm.h>
 #include <errno.h>
 
-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)
+struct udevice *board_get_cros_ec_dev(void)
 {
-#ifdef CONFIG_DM_CROS_EC
 	struct udevice *dev;
 	int ret;
 
@@ -35,40 +23,5 @@ struct cros_ec_dev *board_get_cros_ec_dev(void)
 		debug("%s: Error %d\n", __func__, ret);
 		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);
-}
-
-int cros_ec_get_error(void)
-{
-#ifdef CONFIG_DM_CROS_EC
-	struct udevice *dev;
-	int ret;
-
-	ret = uclass_get_device(UCLASS_CROS_EC, 0, &dev);
-	if (ret && ret != -ENODEV)
-		return ret;
-
-	return 0;
-#else
-	return local.cros_ec_err;
-#endif
+	return dev;
 }