Unverified Commit 19843302 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: amd: acp: declare and add prefix to 'bt_uart_enable' symbol 



Sparse reports the following warning:

sound/soc/amd/acp-pcm-dma.c:39:6: error: symbol 'bt_uart_enable' was
not declared. Should it be static?

It's not very good practice to export such symbols that can easily
conflict, add the acp_ prefix and add declaration in header file.

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


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c3815f8b

sound/soc/amd/acp-da7219-max98357a.c

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static struct clk *da7219_dai_wclk; 
static struct clk *da7219_dai_bclk;

static struct clk *rt5682_dai_wclk;

static struct clk *rt5682_dai_bclk;

extern bool bt_uart_enable;



void *acp_soc_is_rltk_max(struct device *dev);



static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
@@ -760,7 +760,7 @@ static int cz_probe(struct platform_device *pdev) 
				"devm_snd_soc_register_card(%s) failed\n",

				card->name);

	}

	bt_uart_enable = !device_property_read_bool(&pdev->dev,

	acp_bt_uart_enable = !device_property_read_bool(&pdev->dev,

							"bt-pad-enable");

	return 0;

}

sound/soc/amd/acp-pcm-dma.c

+3 −3
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
#define ST_MIN_BUFFER ST_MAX_BUFFER



#define DRV_NAME "acp_audio_dma"

bool bt_uart_enable = true;

EXPORT_SYMBOL(bt_uart_enable);

bool acp_bt_uart_enable = true;

EXPORT_SYMBOL(acp_bt_uart_enable);



static const struct snd_pcm_hardware acp_pcm_hardware_playback = {

	.info = SNDRV_PCM_INFO_INTERLEAVED |
@@ -596,7 +596,7 @@ static int acp_init(void __iomem *acp_mmio, u32 asic_type) 
	acp_reg_write(val, acp_mmio, mmACP_SOFT_RESET);



	/* For BT instance change pins from UART to BT */

	if (!bt_uart_enable) {

	if (!acp_bt_uart_enable) {

		val = acp_reg_read(acp_mmio, mmACP_BT_UART_PAD_SEL);

		val |= ACP_BT_UART_PAD_SELECT_MASK;

		acp_reg_write(val, acp_mmio, mmACP_BT_UART_PAD_SEL);

sound/soc/amd/acp.h

+2 −0
Original line number Diff line number Diff line
@@ -204,4 +204,6 @@ typedef struct acp_dma_dscr_transfer { 
	u32 reserved;

} acp_dma_dscr_transfer_t;



extern bool acp_bt_uart_enable;



#endif /*__ACP_HW_H */