tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: soc-pcm: merge soc_pcm_hw_update_format/subformat()

format() and subformat() should be handled in the same time, no need to
have each functions. Let's merge these

soc_pcm_hw_update_format()
soc_pcm_hw_update_subformat()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/87v7soz664.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown b92bc4d6 de22dc76

+2 -11
+2 -11
sound/soc/soc-pcm.c
··· 603 603 static void soc_pcm_hw_update_format(struct snd_pcm_hardware *hw, 604 604 const struct snd_soc_pcm_stream *p) 605 605 { 606 - hw->formats &= p->formats; 607 - } 608 - 609 - static void soc_pcm_hw_update_subformat(struct snd_pcm_hardware *hw, 610 - const struct snd_soc_pcm_stream *p) 611 - { 612 - hw->subformats &= p->subformats; 606 + hw->formats &= p->formats; 607 + hw->subformats &= p->subformats; 613 608 } 614 609 615 610 /** ··· 645 650 soc_pcm_hw_update_chan(hw, cpu_stream); 646 651 soc_pcm_hw_update_rate(hw, cpu_stream); 647 652 soc_pcm_hw_update_format(hw, cpu_stream); 648 - soc_pcm_hw_update_subformat(hw, cpu_stream); 649 653 } 650 654 cpu_chan_min = hw->channels_min; 651 655 cpu_chan_max = hw->channels_max; ··· 666 672 soc_pcm_hw_update_chan(hw, codec_stream); 667 673 soc_pcm_hw_update_rate(hw, codec_stream); 668 674 soc_pcm_hw_update_format(hw, codec_stream); 669 - soc_pcm_hw_update_subformat(hw, codec_stream); 670 675 } 671 676 672 677 /* Verify both a valid CPU DAI and a valid CODEC DAI were found */ ··· 1758 1765 soc_pcm_hw_update_rate(hw, cpu_stream); 1759 1766 soc_pcm_hw_update_chan(hw, cpu_stream); 1760 1767 soc_pcm_hw_update_format(hw, cpu_stream); 1761 - soc_pcm_hw_update_subformat(hw, cpu_stream); 1762 1768 } 1763 1769 1764 1770 } ··· 1795 1803 codec_stream = snd_soc_dai_get_pcm_stream(dai, stream); 1796 1804 1797 1805 soc_pcm_hw_update_format(hw, codec_stream); 1798 - soc_pcm_hw_update_subformat(hw, codec_stream); 1799 1806 } 1800 1807 } 1801 1808 }