Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / cmd / sound.c

diff --git a/cmd/sound.c b/cmd/sound.c
index 77f51529259e4646c42a1bce0c1a3867de7f6d74..7fc19678ea8f449d178740f2ee9be827dcfea052 100644 (file)
--- a/cmd/sound.c
+++ b/cmd/sound.c
@@ -13,20 +13,15 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 /* Initilaise sound subsystem */
-static int do_init(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_init(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
-#ifdef CONFIG_DM_SOUND
        struct udevice *dev;
-#endif
        int ret;
 
-#ifdef CONFIG_DM_SOUND
        ret = uclass_first_device_err(UCLASS_SOUND, &dev);
        if (!ret)
                ret = sound_setup(dev);
-#else
-       ret = sound_init(gd->fdt_blob);
-#endif
        if (ret) {
                printf("Initialise Audio driver failed (ret=%d)\n", ret);
                return CMD_RET_FAILURE;
@@ -36,11 +31,10 @@ static int do_init(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 }
 
 /* play sound from buffer */
-static int do_play(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_play(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
-#ifdef CONFIG_DM_SOUND
        struct udevice *dev;
-#endif
        int ret = 0;
        int msec = 1000;
        int freq = 400;
@@ -50,13 +44,9 @@ static int do_play(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        if (argc > 2)
                freq = simple_strtoul(argv[2], NULL, 10);
 
-#ifdef CONFIG_DM_SOUND
        ret = uclass_first_device_err(UCLASS_SOUND, &dev);
        if (!ret)
                ret = sound_beep(dev, msec, freq);
-#else
-       ret = sound_play(msec, freq);
-#endif
        if (ret) {
                printf("Sound device failed to play (err=%d)\n", ret);
                return CMD_RET_FAILURE;
@@ -65,15 +55,16 @@ static int do_play(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        return 0;
 }
 
-static cmd_tbl_t cmd_sound_sub[] = {
+static struct cmd_tbl cmd_sound_sub[] = {
        U_BOOT_CMD_MKENT(init, 0, 1, do_init, "", ""),
        U_BOOT_CMD_MKENT(play, 2, 1, do_play, "", ""),
 };
 
 /* process sound command */
-static int do_sound(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_sound(struct cmd_tbl *cmdtp, int flag, int argc,
+                   char *const argv[])
 {
-       cmd_tbl_t *c;
+       struct cmd_tbl *c;
 
        if (argc < 1)
                return CMD_RET_USAGE;