Unverified Commit 584e86e1 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

firmware: cs_dsp: Make wmfw and bin filename arguments const char * 



The wmfw_filename and bin_filename strings passed into cs_dsp_power_up()
and cs_dsp_adsp1_power_up() should be const char *.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20240710103640.78197-3-rf@opensource.cirrus.com


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

drivers/firmware/cirrus/cs_dsp.c

+4 −4
Original line number Diff line number Diff line
@@ -2410,8 +2410,8 @@ EXPORT_SYMBOL_NS_GPL(cs_dsp_adsp1_init, FW_CS_DSP); 
 * Return: Zero for success, a negative number on error.

 */

int cs_dsp_adsp1_power_up(struct cs_dsp *dsp,

			  const struct firmware *wmfw_firmware, char *wmfw_filename,

			  const struct firmware *coeff_firmware, char *coeff_filename,

			  const struct firmware *wmfw_firmware, const char *wmfw_filename,

			  const struct firmware *coeff_firmware, const char *coeff_filename,

			  const char *fw_name)

{

	unsigned int val;
@@ -2704,8 +2704,8 @@ static void cs_dsp_halo_stop_watchdog(struct cs_dsp *dsp) 
 * Return: Zero for success, a negative number on error.

 */

int cs_dsp_power_up(struct cs_dsp *dsp,

		    const struct firmware *wmfw_firmware, char *wmfw_filename,

		    const struct firmware *coeff_firmware, char *coeff_filename,

		    const struct firmware *wmfw_firmware, const char *wmfw_filename,

		    const struct firmware *coeff_firmware, const char *coeff_filename,

		    const char *fw_name)

{

	int ret;

include/linux/firmware/cirrus/cs_dsp.h

+4 −4
Original line number Diff line number Diff line
@@ -213,13 +213,13 @@ int cs_dsp_adsp2_init(struct cs_dsp *dsp); 
int cs_dsp_halo_init(struct cs_dsp *dsp);



int cs_dsp_adsp1_power_up(struct cs_dsp *dsp,

			  const struct firmware *wmfw_firmware, char *wmfw_filename,

			  const struct firmware *coeff_firmware, char *coeff_filename,

			  const struct firmware *wmfw_firmware, const char *wmfw_filename,

			  const struct firmware *coeff_firmware, const char *coeff_filename,

			  const char *fw_name);

void cs_dsp_adsp1_power_down(struct cs_dsp *dsp);

int cs_dsp_power_up(struct cs_dsp *dsp,

		    const struct firmware *wmfw_firmware, char *wmfw_filename,

		    const struct firmware *coeff_firmware, char *coeff_filename,

		    const struct firmware *wmfw_firmware, const char *wmfw_filename,

		    const struct firmware *coeff_firmware, const char *coeff_filename,

		    const char *fw_name);

void cs_dsp_power_down(struct cs_dsp *dsp);

int cs_dsp_run(struct cs_dsp *dsp);