Unverified Commit af57d5e3 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

ASoC: codecs: wcd938x: Constify wcd938x_sdw_ch_info 



Driver does not modify static wcd938x_sdw_ch_info array, so it can be
made const for code safety.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20240612-asoc-wcd9xxx-wide-cleanups-v1-17-0d15885b2a06@linaro.org


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

sound/soc/codecs/wcd938x-sdw.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#define SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(m) (0xE0 + 0x10 * (m))



static struct wcd938x_sdw_ch_info wcd938x_sdw_rx_ch_info[] = {

static const struct wcd938x_sdw_ch_info wcd938x_sdw_rx_ch_info[] = {

	WCD_SDW_CH(WCD938X_HPH_L, WCD938X_HPH_PORT, BIT(0)),

	WCD_SDW_CH(WCD938X_HPH_R, WCD938X_HPH_PORT, BIT(1)),

	WCD_SDW_CH(WCD938X_CLSH, WCD938X_CLSH_PORT, BIT(0)),
@@ -32,7 +32,7 @@ static struct wcd938x_sdw_ch_info wcd938x_sdw_rx_ch_info[] = { 
	WCD_SDW_CH(WCD938X_DSD_R, WCD938X_DSD_PORT, BIT(1)),

};



static struct wcd938x_sdw_ch_info wcd938x_sdw_tx_ch_info[] = {

static const struct wcd938x_sdw_ch_info wcd938x_sdw_tx_ch_info[] = {

	WCD_SDW_CH(WCD938X_ADC1, WCD938X_ADC_1_2_PORT, BIT(0)),

	WCD_SDW_CH(WCD938X_ADC2, WCD938X_ADC_1_2_PORT, BIT(1)),

	WCD_SDW_CH(WCD938X_ADC3, WCD938X_ADC_3_4_PORT, BIT(0)),

sound/soc/codecs/wcd938x.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static int wcd938x_io_init(struct wcd938x_priv *wcd938x) 


}



static int wcd938x_sdw_connect_port(struct wcd938x_sdw_ch_info *ch_info,

static int wcd938x_sdw_connect_port(const struct wcd938x_sdw_ch_info *ch_info,

				    struct sdw_port_config *port_config,

				    u8 enable)

{

sound/soc/codecs/wcd938x.h

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ struct wcd938x_sdw_priv { 
	struct sdw_stream_config sconfig;

	struct sdw_stream_runtime *sruntime;

	struct sdw_port_config port_config[WCD938X_MAX_SWR_PORTS];

	struct wcd938x_sdw_ch_info *ch_info;

	const struct wcd938x_sdw_ch_info *ch_info;

	bool port_enable[WCD938X_MAX_SWR_CH_IDS];

	int active_ports;

	int num_ports;