Commit 43f2cdeb authored by Julia Lawall's avatar Julia Lawall Committed by Takashi Iwai
Browse files

ALSA: ctxfi: constify rsc ops structures 



The various rsc ops structures are never modified, so declare them as
const.

Done with the help of Coccinelle.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 16771c7c

sound/pci/ctxfi/ctamixer.c

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static int amixer_output_slot(const struct rsc *rsc) 
	return (amixer_index(rsc) << 4) + 0x4;

}



static struct rsc_ops amixer_basic_rsc_ops = {

static const struct rsc_ops amixer_basic_rsc_ops = {

	.master		= amixer_master,

	.next_conj	= amixer_next_conj,

	.index		= amixer_index,
@@ -186,7 +186,7 @@ static int amixer_setup(struct amixer *amixer, struct rsc *input, 
	return 0;

}



static struct amixer_rsc_ops amixer_ops = {

static const struct amixer_rsc_ops amixer_ops = {

	.set_input		= amixer_set_input,

	.set_invalid_squash	= amixer_set_invalid_squash,

	.set_scale		= amixer_set_y,
@@ -357,7 +357,7 @@ static int sum_output_slot(const struct rsc *rsc) 
	return (sum_index(rsc) << 4) + 0xc;

}



static struct rsc_ops sum_basic_rsc_ops = {

static const struct rsc_ops sum_basic_rsc_ops = {

	.master		= sum_master,

	.next_conj	= sum_next_conj,

	.index		= sum_index,

sound/pci/ctxfi/ctamixer.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct amixer { 
	unsigned char idx[8];

	struct rsc *input;	/* pointer to a resource acting as source */

	struct sum *sum;	/* Put amixer output to this summation node */

	struct amixer_rsc_ops *ops;	/* AMixer specific operations */

	const struct amixer_rsc_ops *ops;	/* AMixer specific operations */

};



struct amixer_rsc_ops {

sound/pci/ctxfi/ctdaio.c

+5 −5
Original line number Diff line number Diff line
@@ -83,21 +83,21 @@ static int daio_in_next_conj_20k2(struct rsc *rsc) 
	return rsc->conj += 0x100;

}



static struct rsc_ops daio_out_rsc_ops = {

static const struct rsc_ops daio_out_rsc_ops = {

	.master		= daio_master,

	.next_conj	= daio_out_next_conj,

	.index		= daio_index,

	.output_slot	= NULL,

};



static struct rsc_ops daio_in_rsc_ops_20k1 = {

static const struct rsc_ops daio_in_rsc_ops_20k1 = {

	.master		= daio_master,

	.next_conj	= daio_in_next_conj_20k1,

	.index		= NULL,

	.output_slot	= daio_index,

};



static struct rsc_ops daio_in_rsc_ops_20k2 = {

static const struct rsc_ops daio_in_rsc_ops_20k2 = {

	.master		= daio_master,

	.next_conj	= daio_in_next_conj_20k2,

	.index		= NULL,
@@ -263,7 +263,7 @@ static int dao_clear_right_input(struct dao *dao) 
	return 0;

}



static struct dao_rsc_ops dao_ops = {

static const struct dao_rsc_ops dao_ops = {

	.set_spos		= dao_spdif_set_spos,

	.commit_write		= dao_commit_write,

	.get_spos		= dao_spdif_get_spos,
@@ -318,7 +318,7 @@ static int dai_commit_write(struct dai *dai) 
	return 0;

}



static struct dai_rsc_ops dai_ops = {

static const struct dai_rsc_ops dai_ops = {

	.set_srt_srcl		= dai_set_srt_srcl,

	.set_srt_srcr		= dai_set_srt_srcr,

	.set_srt_msr		= dai_set_srt_msr,

sound/pci/ctxfi/ctdaio.h

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct daio { 


struct dao {

	struct daio daio;

	struct dao_rsc_ops *ops;	/* DAO specific operations */

	const struct dao_rsc_ops *ops;	/* DAO specific operations */

	struct imapper **imappers;

	struct daio_mgr *mgr;

	struct hw *hw;
@@ -60,7 +60,7 @@ struct dao { 


struct dai {

	struct daio daio;

	struct dai_rsc_ops *ops;	/* DAI specific operations */

	const struct dai_rsc_ops *ops;	/* DAI specific operations */

	struct hw *hw;

	void *ctrl_blk;

};

sound/pci/ctxfi/ctresource.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int rsc_master(struct rsc *rsc) 
	return rsc->conj = rsc->idx;

}



static struct rsc_ops rsc_generic_ops = {

static const struct rsc_ops rsc_generic_ops = {

	.index		= rsc_index,

	.output_slot	= audio_ring_slot,

	.master		= rsc_master,