commit 1a8074b548ea350eede9d5a09386810690fb5209
author Chinyue Chen <chinyue@google.com> Fri May 12 03:00:06 2017
committer chrome-bot <chrome-bot@chromium.org> Sat May 13 03:58:04 2017
tree 71872e0a58f61d10cc20ae1c985f6b7c23c31e14
parent 3615ecbae09a43a52ddc716a0c038729fe24f5fd

CRAS: alsa_io - Remove unneeded update_supported_formats call.

The update_supported_formats is called when a device is being opened
(as part of cras_iodev_set_format) so we don't need to call it when a
device is created.

BUG=b:719812
TEST=make check && tested on reef.

Change-Id: I6b901aff4a2d1b6a07bd3c40b1014d5b828e7dfb
Reviewed-on: https://chromium-review.googlesource.com/503947
Commit-Ready: Chinyue Chen <chinyue@chromium.org>
Tested-by: Chinyue Chen <chinyue@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>

cras/src/server/cras_alsa_io.c

diff --git a/cras/src/server/cras_alsa_io.c b/cras/src/server/cras_alsa_io.c
index a57e22d..80a8c3b 100644
--- a/cras/src/server/cras_alsa_io.c
+++ b/cras/src/server/cras_alsa_io.c
@@ -1814,7 +1814,6 @@
 {
 	struct alsa_io *aio;
 	struct cras_iodev *iodev;
-	int err;
 
 	if (direction != CRAS_STREAM_INPUT && direction != CRAS_STREAM_OUTPUT)
 		return NULL;
@@ -1917,15 +1916,6 @@
 			ucm_get_enable_htimestamp_flag(ucm);
 	}
 
-	err = update_supported_formats(iodev);
-	if (err < 0 || iodev->supported_rates[0] == 0 ||
-	    iodev->supported_channel_counts[0] == 0 ||
-	    iodev->supported_formats[0] == 0) {
-		syslog(LOG_ERR, "Updating formats: %s", strerror(err));
-		goto cleanup_iodev;
-	}
-
-
 	set_iodev_name(iodev, card_name, dev_name, card_index, device_index,
 		       card_type, usb_vid, usb_pid, usb_serial_number);
 

cras/src/tests/alsa_io_unittest.cc

diff --git a/cras/src/tests/alsa_io_unittest.cc b/cras/src/tests/alsa_io_unittest.cc
index 5a0d0e8..dc58cd7 100644
--- a/cras/src/tests/alsa_io_unittest.cc
+++ b/cras/src/tests/alsa_io_unittest.cc
@@ -282,7 +282,7 @@
   /* Get volume curve twice for iodev, and default node. */
   EXPECT_EQ(2, cras_card_config_get_volume_curve_for_control_called);
   EXPECT_EQ(SND_PCM_STREAM_PLAYBACK, aio->alsa_stream);
-  EXPECT_EQ(1, cras_alsa_fill_properties_called);
+  EXPECT_EQ(0, cras_alsa_fill_properties_called);
   EXPECT_EQ(1, cras_alsa_mixer_list_outputs_called);
   EXPECT_EQ(0, strncmp(test_card_name,
                        aio->base.info.name,
@@ -568,7 +568,7 @@
   ASSERT_EQ(0, alsa_iodev_legacy_complete_init((struct cras_iodev *)aio));
   EXPECT_EQ(2, cras_card_config_get_volume_curve_for_control_called);
   EXPECT_EQ(SND_PCM_STREAM_PLAYBACK, aio->alsa_stream);
-  EXPECT_EQ(1, cras_alsa_fill_properties_called);
+  EXPECT_EQ(0, cras_alsa_fill_properties_called);
   EXPECT_EQ(1, cras_alsa_mixer_list_outputs_called);
   EXPECT_EQ(1, cras_alsa_jack_list_create_called);
   EXPECT_EQ(1, cras_alsa_jack_list_find_jacks_by_name_matching_called);
@@ -599,7 +599,7 @@
   ASSERT_EQ(0, alsa_iodev_legacy_complete_init((struct cras_iodev *)aio));
 
   EXPECT_EQ(SND_PCM_STREAM_CAPTURE, aio->alsa_stream);
-  EXPECT_EQ(1, cras_alsa_fill_properties_called);
+  EXPECT_EQ(0, cras_alsa_fill_properties_called);
   EXPECT_EQ(1, cras_alsa_jack_list_create_called);
   EXPECT_EQ(1, cras_alsa_jack_list_find_jacks_by_name_matching_called);
   EXPECT_EQ(0, cras_alsa_jack_list_add_jack_for_section_called);
@@ -628,7 +628,7 @@
   ASSERT_EQ(0, alsa_iodev_legacy_complete_init((struct cras_iodev *)aio));
 
   EXPECT_EQ(SND_PCM_STREAM_CAPTURE, aio->alsa_stream);
-  EXPECT_EQ(1, cras_alsa_fill_properties_called);
+  EXPECT_EQ(0, cras_alsa_fill_properties_called);
   EXPECT_EQ(1, cras_alsa_mixer_list_inputs_called);
 
   alsa_iodev_destroy((struct cras_iodev *)aio);