0312-Revert-bcm2835-log-which-channel-map-is-set.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233
  1. From 6b600a159a7204835e8f86d1fe7554c4fd2e088f Mon Sep 17 00:00:00 2001
  2. From: popcornmix <popcornmix@gmail.com>
  3. Date: Fri, 29 Apr 2016 17:27:33 +0100
  4. Subject: [PATCH 312/381] Revert "bcm2835: log which channel map is set"
  5. This reverts commit cd560b8658868d9652ab31754e02f86daf6831ba.
  6. ---
  7. sound/arm/bcm2835-vchiq.c | 5 -----
  8. 1 file changed, 5 deletions(-)
  9. --- a/sound/arm/bcm2835-vchiq.c
  10. +++ b/sound/arm/bcm2835-vchiq.c
  11. @@ -596,11 +596,8 @@ int bcm2835_audio_set_params(bcm2835_als
  12. instance->result = -1;
  13. if (alsa_stream->chip->cea_chmap >= 0) {
  14. - LOG_INFO("Using application requested channel map: %d\n",
  15. - alsa_stream->chip->cea_chmap);
  16. chmap_value = (unsigned)alsa_stream->chip->cea_chmap << 24;
  17. } else {
  18. - LOG_INFO("Using fallback channel map.\n");
  19. /* fallback layouts for applications which do not use chmap API */
  20. chmap_value = 0x00;
  21. switch (channels) {
  22. @@ -617,8 +614,6 @@ int bcm2835_audio_set_params(bcm2835_als
  23. for (i = 0; i < 8; i++)
  24. chmap_value |= alsa_stream->chip->map_channels[i] << (i * 3);
  25. - LOG_INFO("Requesting AUDS channel map: 0x%lx\n", (long)chmap_value);
  26. -
  27. m.type = VC_AUDIO_MSG_TYPE_CONFIG;
  28. m.u.config.channels = channels;
  29. m.u.config.samplerate = samplerate;