Commit cab941b7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Constify audioformat pointer references 



The audioformat is referred in many places but most of usages are
read-only.  Let's add const prefix in the possible places.

Tested-by: default avatarKeith Milner <kamilner@superlative.org>
Tested-by: default avatarDylan Robinson <dylan_robinson@motu.com>
Link: https://lore.kernel.org/r/20201123085347.19667-28-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c15871e1

sound/usb/card.h

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ struct snd_usb_endpoint { 
	bool need_setup;		/* (re-)need for configure? */



	/* for hw constraints */

	struct audioformat *cur_audiofmt;

	const struct audioformat *cur_audiofmt;

	unsigned int cur_rate;

	snd_pcm_format_t cur_format;

	unsigned int cur_channels;
@@ -142,7 +142,7 @@ struct snd_usb_substream { 
	int direction;	/* playback or capture */

	int interface;	/* current interface */

	int endpoint;	/* assigned endpoint */

	struct audioformat *cur_audiofmt;	/* current audioformat pointer (for hw_params callback) */

	const struct audioformat *cur_audiofmt;	/* current audioformat pointer (for hw_params callback) */

	struct snd_usb_power_domain *str_pd;	/* UAC3 Power Domain for streaming path */

	snd_pcm_format_t pcm_format;	/* current audio format (for hw_params callback) */

	unsigned int channels;		/* current number of channels (for hw_params callback) */

sound/usb/clock.c

+8 −8
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int uac_clock_selector_set_val(struct snd_usb_audio *chip, int selector_i 
}



static bool uac_clock_source_is_valid_quirk(struct snd_usb_audio *chip,

					    struct audioformat *fmt,

					    const struct audioformat *fmt,

					    int source_id)

{

	bool ret = false;
@@ -215,7 +215,7 @@ static bool uac_clock_source_is_valid_quirk(struct snd_usb_audio *chip, 
}



static bool uac_clock_source_is_valid(struct snd_usb_audio *chip,

				      struct audioformat *fmt,

				      const struct audioformat *fmt,

				      int source_id)

{

	int err;
@@ -264,7 +264,7 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, 
}



static int __uac_clock_find_source(struct snd_usb_audio *chip,

				   struct audioformat *fmt, int entity_id,

				   const struct audioformat *fmt, int entity_id,

				   unsigned long *visited, bool validate)

{

	struct uac_clock_source_descriptor *source;
@@ -358,7 +358,7 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip, 
}



static int __uac3_clock_find_source(struct snd_usb_audio *chip,

				    struct audioformat *fmt, int entity_id,

				    const struct audioformat *fmt, int entity_id,

				    unsigned long *visited, bool validate)

{

	struct uac3_clock_source_descriptor *source;
@@ -464,7 +464,7 @@ static int __uac3_clock_find_source(struct snd_usb_audio *chip, 
 * Returns the clock source UnitID (>=0) on success, or an error.

 */

int snd_usb_clock_find_source(struct snd_usb_audio *chip,

			      struct audioformat *fmt, bool validate)

			      const struct audioformat *fmt, bool validate)

{

	DECLARE_BITMAP(visited, 256);

	memset(visited, 0, sizeof(visited));
@@ -482,7 +482,7 @@ int snd_usb_clock_find_source(struct snd_usb_audio *chip, 
}



static int set_sample_rate_v1(struct snd_usb_audio *chip,

			      struct audioformat *fmt, int rate)

			      const struct audioformat *fmt, int rate)

{

	struct usb_device *dev = chip->dev;

	struct usb_host_interface *alts;
@@ -611,7 +611,7 @@ int snd_usb_set_sample_rate_v2v3(struct snd_usb_audio *chip, 
}



static int set_sample_rate_v2v3(struct snd_usb_audio *chip,

				struct audioformat *fmt, int rate)

				const struct audioformat *fmt, int rate)

{

	int cur_rate, prev_rate;

	int clock;
@@ -663,7 +663,7 @@ static int set_sample_rate_v2v3(struct snd_usb_audio *chip, 
}



int snd_usb_init_sample_rate(struct snd_usb_audio *chip,

			     struct audioformat *fmt, int rate)

			     const struct audioformat *fmt, int rate)

{

	usb_audio_dbg(chip, "%d:%d Set sample rate %d, clock %d\n",

		      fmt->iface, fmt->altsetting, rate, fmt->clock);

sound/usb/clock.h

+2 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
#define __USBAUDIO_CLOCK_H



int snd_usb_init_sample_rate(struct snd_usb_audio *chip,

			     struct audioformat *fmt, int rate);

			     const struct audioformat *fmt, int rate);



int snd_usb_clock_find_source(struct snd_usb_audio *chip,

			      struct audioformat *fmt, bool validate);

			      const struct audioformat *fmt, bool validate);



int snd_usb_set_sample_rate_v2v3(struct snd_usb_audio *chip,

				 const struct audioformat *fmt,

sound/usb/endpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ bool snd_usb_endpoint_compatible(struct snd_usb_audio *chip, 
 */

struct snd_usb_endpoint *

snd_usb_endpoint_open(struct snd_usb_audio *chip,

		      struct audioformat *fp,

		      const struct audioformat *fp,

		      const struct snd_pcm_hw_params *params,

		      bool is_sync_ep)

{

sound/usb/endpoint.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ int snd_usb_add_endpoint(struct snd_usb_audio *chip, int ep_num, int type); 


struct snd_usb_endpoint *

snd_usb_endpoint_open(struct snd_usb_audio *chip,

		      struct audioformat *fp,

		      const struct audioformat *fp,

		      const struct snd_pcm_hw_params *params,

		      bool is_sync_ep);

void snd_usb_endpoint_close(struct snd_usb_audio *chip,