Commit 183c7687 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: intel: move shutdown() callback and don't export symbol 



All DAI callbacks are in intel.c except for shutdown. Move and remove
export symbol

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190806005522.22642-18-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 04592dce

drivers/soundwire/cadence_master.c

+0 −14
Original line number Diff line number Diff line
@@ -1222,19 +1222,5 @@ int sdw_cdns_alloc_stream(struct sdw_cdns *cdns, 
}

EXPORT_SYMBOL(sdw_cdns_alloc_stream);



void sdw_cdns_shutdown(struct snd_pcm_substream *substream,

		       struct snd_soc_dai *dai)

{

	struct sdw_cdns_dma_data *dma;



	dma = snd_soc_dai_get_dma_data(dai, substream);

	if (!dma)

		return;



	snd_soc_dai_set_dma_data(dai, substream, NULL);

	kfree(dma);

}

EXPORT_SYMBOL(sdw_cdns_shutdown);



MODULE_LICENSE("Dual BSD/GPL");

MODULE_DESCRIPTION("Cadence Soundwire Library");

drivers/soundwire/cadence_master.h

+0 −2
Original line number Diff line number Diff line
@@ -172,8 +172,6 @@ int sdw_cdns_alloc_stream(struct sdw_cdns *cdns, 
void sdw_cdns_config_stream(struct sdw_cdns *cdns, struct sdw_cdns_port *port,

			    u32 ch, u32 dir, struct sdw_cdns_pdi *pdi);



void sdw_cdns_shutdown(struct snd_pcm_substream *substream,

		       struct snd_soc_dai *dai);

int sdw_cdns_pcm_set_stream(struct snd_soc_dai *dai,

			    void *stream, int direction);

int sdw_cdns_pdm_set_stream(struct snd_soc_dai *dai,

drivers/soundwire/intel.c

+15 −2
Original line number Diff line number Diff line
@@ -661,6 +661,19 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) 
	return ret;

}



static void intel_shutdown(struct snd_pcm_substream *substream,

			   struct snd_soc_dai *dai)

{

	struct sdw_cdns_dma_data *dma;



	dma = snd_soc_dai_get_dma_data(dai, substream);

	if (!dma)

		return;



	snd_soc_dai_set_dma_data(dai, substream, NULL);

	kfree(dma);

}



static int intel_pcm_set_sdw_stream(struct snd_soc_dai *dai,

				    void *stream, int direction)

{
@@ -676,14 +689,14 @@ static int intel_pdm_set_sdw_stream(struct snd_soc_dai *dai, 
static const struct snd_soc_dai_ops intel_pcm_dai_ops = {

	.hw_params = intel_hw_params,

	.hw_free = intel_hw_free,

	.shutdown = sdw_cdns_shutdown,

	.shutdown = intel_shutdown,

	.set_sdw_stream = intel_pcm_set_sdw_stream,

};



static const struct snd_soc_dai_ops intel_pdm_dai_ops = {

	.hw_params = intel_hw_params,

	.hw_free = intel_hw_free,

	.shutdown = sdw_cdns_shutdown,

	.shutdown = intel_shutdown,

	.set_sdw_stream = intel_pdm_set_sdw_stream,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE