X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=common%2Fcros_ec.c;h=1a0caf80dde09551133f882df5c34fb9608e5461;hb=6915dcf35987d654b491524f151e56b91e0d0ec9;hp=bb299bccfff7073791ad9b1cedf5c1d3c171d190;hpb=dee8abcd80d0981f7a1c2bb5d1f2e9313fddf189;p=platform%2Fkernel%2Fu-boot.git diff --git a/common/cros_ec.c b/common/cros_ec.c index bb299bc..1a0caf8 100644 --- a/common/cros_ec.c +++ b/common/cros_ec.c @@ -13,20 +13,8 @@ #include #include -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; @@ -35,31 +23,11 @@ struct cros_ec_dev *board_get_cros_ec_dev(void) debug("%s: Error %d\n", __func__, ret); return NULL; } - return dev->uclass_priv; -#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 dev_get_uclass_priv(dev); } int cros_ec_get_error(void) { -#ifdef CONFIG_DM_CROS_EC struct udevice *dev; int ret; @@ -68,7 +36,4 @@ int cros_ec_get_error(void) return ret; return 0; -#else - return local.cros_ec_err; -#endif }