Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b9866c8 authored by Julia Lawall's avatar Julia Lawall Committed by Takashi Iwai
Browse files

ALSA: bebob: constify various snd_bebob structures 



The structures of type snd_bebob_clock_spec, snd_bebob_rate_spec,
snd_bebob_meter_spec, and snd_bebob_spec are never modified after they are
initialized.  Make them all const.

Done with the help of Coccinelle.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Tested-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bde3e288

sound/firewire/bebob/bebob.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static void bebob_remove(struct fw_unit *unit) 
	snd_card_free_when_closed(bebob->card);

}



static struct snd_bebob_rate_spec normal_rate_spec = {

static const struct snd_bebob_rate_spec normal_rate_spec = {

	.get	= &snd_bebob_stream_get_rate,

	.set	= &snd_bebob_stream_set_rate

};

sound/firewire/bebob/bebob.h

+16 −16
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ struct snd_bebob_meter_spec { 
	int (*get)(struct snd_bebob *bebob, u32 *target, unsigned int size);

};

struct snd_bebob_spec {

	struct snd_bebob_clock_spec *clock;

	struct snd_bebob_rate_spec *rate;

	struct snd_bebob_meter_spec *meter;

	const struct snd_bebob_clock_spec *clock;

	const struct snd_bebob_rate_spec *rate;

	const struct snd_bebob_meter_spec *meter;

};



struct snd_bebob {
@@ -235,19 +235,19 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob); 
int snd_bebob_create_hwdep_device(struct snd_bebob *bebob);



/* model specific operations */

extern struct snd_bebob_spec phase88_rack_spec;

extern struct snd_bebob_spec phase24_series_spec;

extern struct snd_bebob_spec yamaha_go_spec;

extern struct snd_bebob_spec saffirepro_26_spec;

extern struct snd_bebob_spec saffirepro_10_spec;

extern struct snd_bebob_spec saffire_le_spec;

extern struct snd_bebob_spec saffire_spec;

extern struct snd_bebob_spec maudio_fw410_spec;

extern struct snd_bebob_spec maudio_audiophile_spec;

extern struct snd_bebob_spec maudio_solo_spec;

extern struct snd_bebob_spec maudio_ozonic_spec;

extern struct snd_bebob_spec maudio_nrv10_spec;

extern struct snd_bebob_spec maudio_special_spec;

extern const struct snd_bebob_spec phase88_rack_spec;

extern const struct snd_bebob_spec phase24_series_spec;

extern const struct snd_bebob_spec yamaha_go_spec;

extern const struct snd_bebob_spec saffirepro_26_spec;

extern const struct snd_bebob_spec saffirepro_10_spec;

extern const struct snd_bebob_spec saffire_le_spec;

extern const struct snd_bebob_spec saffire_spec;

extern const struct snd_bebob_spec maudio_fw410_spec;

extern const struct snd_bebob_spec maudio_audiophile_spec;

extern const struct snd_bebob_spec maudio_solo_spec;

extern const struct snd_bebob_spec maudio_ozonic_spec;

extern const struct snd_bebob_spec maudio_nrv10_spec;

extern const struct snd_bebob_spec maudio_special_spec;

int snd_bebob_maudio_special_discover(struct snd_bebob *bebob, bool is1814);

int snd_bebob_maudio_load_firmware(struct fw_unit *unit);

sound/firewire/bebob/bebob_focusrite.c

+13 −13
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ saffirepro_both_clk_src_get(struct snd_bebob *bebob, unsigned int *id) 
	return err;

}



struct snd_bebob_spec saffire_le_spec;

const struct snd_bebob_spec saffire_le_spec;

static enum snd_bebob_clock_type saffire_both_clk_src_types[] = {

	SND_BEBOB_CLOCK_TYPE_INTERNAL,

	SND_BEBOB_CLOCK_TYPE_EXTERNAL,
@@ -229,7 +229,7 @@ static const char *const saffire_meter_labels[] = { 
static int

saffire_meter_get(struct snd_bebob *bebob, u32 *buf, unsigned int size)

{

	struct snd_bebob_meter_spec *spec = bebob->spec->meter;

	const struct snd_bebob_meter_spec *spec = bebob->spec->meter;

	unsigned int channels;

	u64 offset;

	int err;
@@ -260,60 +260,60 @@ saffire_meter_get(struct snd_bebob *bebob, u32 *buf, unsigned int size) 
	return err;

}



static struct snd_bebob_rate_spec saffirepro_both_rate_spec = {

static const struct snd_bebob_rate_spec saffirepro_both_rate_spec = {

	.get	= &saffirepro_both_clk_freq_get,

	.set	= &saffirepro_both_clk_freq_set,

};

/* Saffire Pro 26 I/O  */

static struct snd_bebob_clock_spec saffirepro_26_clk_spec = {

static const struct snd_bebob_clock_spec saffirepro_26_clk_spec = {

	.num	= ARRAY_SIZE(saffirepro_26_clk_src_types),

	.types	= saffirepro_26_clk_src_types,

	.get	= &saffirepro_both_clk_src_get,

};

struct snd_bebob_spec saffirepro_26_spec = {

const struct snd_bebob_spec saffirepro_26_spec = {

	.clock	= &saffirepro_26_clk_spec,

	.rate	= &saffirepro_both_rate_spec,

	.meter	= NULL

};

/* Saffire Pro 10 I/O */

static struct snd_bebob_clock_spec saffirepro_10_clk_spec = {

static const struct snd_bebob_clock_spec saffirepro_10_clk_spec = {

	.num	= ARRAY_SIZE(saffirepro_10_clk_src_types),

	.types	= saffirepro_10_clk_src_types,

	.get	= &saffirepro_both_clk_src_get,

};

struct snd_bebob_spec saffirepro_10_spec = {

const struct snd_bebob_spec saffirepro_10_spec = {

	.clock	= &saffirepro_10_clk_spec,

	.rate	= &saffirepro_both_rate_spec,

	.meter	= NULL

};



static struct snd_bebob_rate_spec saffire_both_rate_spec = {

static const struct snd_bebob_rate_spec saffire_both_rate_spec = {

	.get	= &snd_bebob_stream_get_rate,

	.set	= &snd_bebob_stream_set_rate,

};

static struct snd_bebob_clock_spec saffire_both_clk_spec = {

static const struct snd_bebob_clock_spec saffire_both_clk_spec = {

	.num	= ARRAY_SIZE(saffire_both_clk_src_types),

	.types	= saffire_both_clk_src_types,

	.get	= &saffire_both_clk_src_get,

};

/* Saffire LE */

static struct snd_bebob_meter_spec saffire_le_meter_spec = {

static const struct snd_bebob_meter_spec saffire_le_meter_spec = {

	.num	= ARRAY_SIZE(saffire_le_meter_labels),

	.labels	= saffire_le_meter_labels,

	.get	= &saffire_meter_get,

};

struct snd_bebob_spec saffire_le_spec = {

const struct snd_bebob_spec saffire_le_spec = {

	.clock	= &saffire_both_clk_spec,

	.rate	= &saffire_both_rate_spec,

	.meter	= &saffire_le_meter_spec

};

/* Saffire */

static struct snd_bebob_meter_spec saffire_meter_spec = {

static const struct snd_bebob_meter_spec saffire_meter_spec = {

	.num	= ARRAY_SIZE(saffire_meter_labels),

	.labels	= saffire_meter_labels,

	.get	= &saffire_meter_get,

};

struct snd_bebob_spec saffire_spec = {

const struct snd_bebob_spec saffire_spec = {

	.clock	= &saffire_both_clk_spec,

	.rate	= &saffire_both_rate_spec,

	.meter	= &saffire_meter_spec

sound/firewire/bebob/bebob_maudio.c

+16 −16
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static const char *const nrv10_meter_labels[] = { 
static int

normal_meter_get(struct snd_bebob *bebob, u32 *buf, unsigned int size)

{

	struct snd_bebob_meter_spec *spec = bebob->spec->meter;

	const struct snd_bebob_meter_spec *spec = bebob->spec->meter;

	unsigned int c, channels;

	int err;
@@ -712,85 +712,85 @@ normal_meter_get(struct snd_bebob *bebob, u32 *buf, unsigned int size) 
}



/* for special customized devices */

static struct snd_bebob_rate_spec special_rate_spec = {

static const struct snd_bebob_rate_spec special_rate_spec = {

	.get	= &special_get_rate,

	.set	= &special_set_rate,

};

static struct snd_bebob_clock_spec special_clk_spec = {

static const struct snd_bebob_clock_spec special_clk_spec = {

	.num	= ARRAY_SIZE(special_clk_types),

	.types	= special_clk_types,

	.get	= &special_clk_get,

};

static struct snd_bebob_meter_spec special_meter_spec = {

static const struct snd_bebob_meter_spec special_meter_spec = {

	.num	= ARRAY_SIZE(special_meter_labels),

	.labels	= special_meter_labels,

	.get	= &special_meter_get

};

struct snd_bebob_spec maudio_special_spec = {

const struct snd_bebob_spec maudio_special_spec = {

	.clock	= &special_clk_spec,

	.rate	= &special_rate_spec,

	.meter	= &special_meter_spec

};



/* Firewire 410 specification */

static struct snd_bebob_rate_spec usual_rate_spec = {

static const struct snd_bebob_rate_spec usual_rate_spec = {

	.get	= &snd_bebob_stream_get_rate,

	.set	= &snd_bebob_stream_set_rate,

};

static struct snd_bebob_meter_spec fw410_meter_spec = {

static const struct snd_bebob_meter_spec fw410_meter_spec = {

	.num	= ARRAY_SIZE(fw410_meter_labels),

	.labels	= fw410_meter_labels,

	.get	= &normal_meter_get

};

struct snd_bebob_spec maudio_fw410_spec = {

const struct snd_bebob_spec maudio_fw410_spec = {

	.clock	= NULL,

	.rate	= &usual_rate_spec,

	.meter	= &fw410_meter_spec

};



/* Firewire Audiophile specification */

static struct snd_bebob_meter_spec audiophile_meter_spec = {

static const struct snd_bebob_meter_spec audiophile_meter_spec = {

	.num	= ARRAY_SIZE(audiophile_meter_labels),

	.labels	= audiophile_meter_labels,

	.get	= &normal_meter_get

};

struct snd_bebob_spec maudio_audiophile_spec = {

const struct snd_bebob_spec maudio_audiophile_spec = {

	.clock	= NULL,

	.rate	= &usual_rate_spec,

	.meter	= &audiophile_meter_spec

};



/* Firewire Solo specification */

static struct snd_bebob_meter_spec solo_meter_spec = {

static const struct snd_bebob_meter_spec solo_meter_spec = {

	.num	= ARRAY_SIZE(solo_meter_labels),

	.labels	= solo_meter_labels,

	.get	= &normal_meter_get

};

struct snd_bebob_spec maudio_solo_spec = {

const struct snd_bebob_spec maudio_solo_spec = {

	.clock	= NULL,

	.rate	= &usual_rate_spec,

	.meter	= &solo_meter_spec

};



/* Ozonic specification */

static struct snd_bebob_meter_spec ozonic_meter_spec = {

static const struct snd_bebob_meter_spec ozonic_meter_spec = {

	.num	= ARRAY_SIZE(ozonic_meter_labels),

	.labels	= ozonic_meter_labels,

	.get	= &normal_meter_get

};

struct snd_bebob_spec maudio_ozonic_spec = {

const struct snd_bebob_spec maudio_ozonic_spec = {

	.clock	= NULL,

	.rate	= &usual_rate_spec,

	.meter	= &ozonic_meter_spec

};



/* NRV10 specification */

static struct snd_bebob_meter_spec nrv10_meter_spec = {

static const struct snd_bebob_meter_spec nrv10_meter_spec = {

	.num	= ARRAY_SIZE(nrv10_meter_labels),

	.labels	= nrv10_meter_labels,

	.get	= &normal_meter_get

};

struct snd_bebob_spec maudio_nrv10_spec = {

const struct snd_bebob_spec maudio_nrv10_spec = {

	.clock	= NULL,

	.rate	= &usual_rate_spec,

	.meter	= &nrv10_meter_spec

sound/firewire/bebob/bebob_pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int 
pcm_open(struct snd_pcm_substream *substream)

{

	struct snd_bebob *bebob = substream->private_data;

	struct snd_bebob_rate_spec *spec = bebob->spec->rate;

	const struct snd_bebob_rate_spec *spec = bebob->spec->rate;

	unsigned int sampling_rate;

	enum snd_bebob_clock_type src;

	int err;