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

soundwire: intel: remove .free callback implementation

The interface is not needed for IPC3 solution but will be needed with
an updated parameter list for ACE2.x+IPC4 combinations.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230515071042.2038-26-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Pierre-Louis Bossart and committed by
Vinod Koul
01271045 8bff8c49

+1 -36
+1 -36
drivers/soundwire/intel.c
··· 663 663 return -EIO; 664 664 } 665 665 666 - static int intel_free_stream(struct sdw_intel *sdw, 667 - int stream, 668 - struct snd_soc_dai *dai, 669 - int link_id) 670 - { 671 - struct sdw_intel_link_res *res = sdw->link_res; 672 - struct sdw_intel_stream_free_data free_data; 673 - 674 - free_data.stream = stream; /* direction */ 675 - free_data.dai = dai; 676 - free_data.link_id = link_id; 677 - 678 - if (res->ops && res->ops->free_stream && res->dev) 679 - return res->ops->free_stream(res->dev, 680 - &free_data); 681 - 682 - return 0; 683 - } 684 - 685 666 /* 686 667 * DAI routines 687 668 */ ··· 798 817 intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) 799 818 { 800 819 struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai); 801 - struct sdw_intel *sdw = cdns_to_intel(cdns); 802 820 struct sdw_cdns_dai_runtime *dai_runtime; 803 821 int ret; 804 822 ··· 815 835 if (ret < 0) { 816 836 dev_err(dai->dev, "remove master from stream %s failed: %d\n", 817 837 dai_runtime->stream->name, ret); 818 - return ret; 819 - } 820 - 821 - ret = intel_free_stream(sdw, substream->stream, dai, sdw->instance); 822 - if (ret < 0) { 823 - dev_err(dai->dev, "intel_free_stream: failed %d\n", ret); 824 838 return ret; 825 839 } 826 840 ··· 845 871 static int intel_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) 846 872 { 847 873 struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai); 848 - struct sdw_intel *sdw = cdns_to_intel(cdns); 849 874 struct sdw_cdns_dai_runtime *dai_runtime; 850 875 int ret = 0; 851 876 ··· 867 894 868 895 dai_runtime->suspended = true; 869 896 870 - ret = intel_free_stream(sdw, substream->stream, dai, sdw->instance); 871 897 break; 872 898 873 899 case SNDRV_PCM_TRIGGER_PAUSE_PUSH: ··· 912 940 */ 913 941 for_each_component_dais(component, dai) { 914 942 struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai); 915 - struct sdw_intel *sdw = cdns_to_intel(cdns); 916 943 struct sdw_cdns_dai_runtime *dai_runtime; 917 - int ret; 918 944 919 945 dai_runtime = cdns->dai_runtime_array[dai->id]; 920 946 ··· 922 952 if (dai_runtime->suspended) 923 953 continue; 924 954 925 - if (dai_runtime->paused) { 955 + if (dai_runtime->paused) 926 956 dai_runtime->suspended = true; 927 - 928 - ret = intel_free_stream(sdw, dai_runtime->direction, dai, sdw->instance); 929 - if (ret < 0) 930 - return ret; 931 - } 932 957 } 933 958 934 959 return 0;