sandbox: cros_ec: exynos: Drop use of cros_ec_get_error()

This function is really just a call to uclass_get_device() and there is no
reason why the caller cannot do it. Update sandbox and snow accordingly.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index c4b6bae..6fd26a3 100644 (file)
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -306,14 +306,16 @@ int checkboard(void)
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
-       stdio_print_current_devices();
+       struct udevice *dev;
+       int ret;
 
-       if (cros_ec_get_error()) {
+       stdio_print_current_devices();
+       ret = uclass_first_device_err(UCLASS_CROS_EC, &dev);
+       if (ret && ret != -ENODEV) {
                /* Force console on */
                gd->flags &= ~GD_FLG_SILENT;
 
-               printf("cros-ec communications failure %d\n",
-                      cros_ec_get_error());
+               printf("cros-ec communications failure %d\n", ret);
                puts("\nPlease reset with Power+Refresh\n\n");
                panic("Cannot init cros-ec device");
                return -1;

diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c
index 0e87674..397e756 100644 (file)
--- a/board/sandbox/sandbox.c
+++ b/board/sandbox/sandbox.c
@@ -59,12 +59,15 @@ int board_init(void)
 #ifdef CONFIG_BOARD_LATE_INIT
 int board_late_init(void)
 {
-       if (cros_ec_get_error()) {
+       struct udevice *dev;
+       int ret;
+
+       ret = uclass_first_device_err(UCLASS_CROS_EC, &dev);
+       if (ret && ret != -ENODEV) {
                /* Force console on */
                gd->flags &= ~GD_FLG_SILENT;
 
-               printf("cros-ec communications failure %d\n",
-                      cros_ec_get_error());
+               printf("cros-ec communications failure %d\n", ret);
                puts("\nPlease reset with Power+Refresh\n\n");
                panic("Cannot init cros-ec device");
                return -1;

diff --git a/common/cros_ec.c b/common/cros_ec.c
index 4ca15e1..e66471e 100644 (file)
--- a/common/cros_ec.c
+++ b/common/cros_ec.c
@@ -25,15 +25,3 @@ struct udevice *board_get_cros_ec_dev(void)
        }
        return dev;
 }
-
-int cros_ec_get_error(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = uclass_get_device(UCLASS_CROS_EC, 0, &dev);
-       if (ret && ret != -ENODEV)
-               return ret;
-
-       return 0;
-}