OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Julia Lawall 2015-11-08 23:40:41 +01:00 committed by Takashi Iwai
parent 16771c7c70
commit 43f2cdeb7a
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/pci/ctxfi/ctamixer.c
View File

@ -49,7 +49,7 @@ static int amixer_output_slot(const struct rsc *rsc)
return (amixer_index(rsc) << 4) + 0x4; 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, .master = amixer_master,
.next_conj = amixer_next_conj, .next_conj = amixer_next_conj,
.index = amixer_index, .index = amixer_index,
@ -186,7 +186,7 @@ static int amixer_setup(struct amixer *amixer, struct rsc *input,
return 0; return 0;
} }
static struct amixer_rsc_ops amixer_ops = { static const struct amixer_rsc_ops amixer_ops = {
.set_input = amixer_set_input, .set_input = amixer_set_input,
.set_invalid_squash = amixer_set_invalid_squash, .set_invalid_squash = amixer_set_invalid_squash,
.set_scale = amixer_set_y, .set_scale = amixer_set_y,
@ -357,7 +357,7 @@ static int sum_output_slot(const struct rsc *rsc)
return (sum_index(rsc) << 4) + 0xc; 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, .master = sum_master,
.next_conj = sum_next_conj, .next_conj = sum_next_conj,
.index = sum_index, .index = sum_index,

2
sound/pci/ctxfi/ctamixer.h
View File

@ -58,7 +58,7 @@ struct amixer {
unsigned char idx[8]; unsigned char idx[8];
struct rsc *input; /* pointer to a resource acting as source */ struct rsc *input; /* pointer to a resource acting as source */
struct sum *sum; /* Put amixer output to this summation node */ 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 { struct amixer_rsc_ops {

10
sound/pci/ctxfi/ctdaio.c
View File

@ -83,21 +83,21 @@ static int daio_in_next_conj_20k2(struct rsc *rsc)
return rsc->conj += 0x100; return rsc->conj += 0x100;
} }
static struct rsc_ops daio_out_rsc_ops = { static const struct rsc_ops daio_out_rsc_ops = {
.master = daio_master, .master = daio_master,
.next_conj = daio_out_next_conj, .next_conj = daio_out_next_conj,
.index = daio_index, .index = daio_index,
.output_slot = NULL, .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, .master = daio_master,
.next_conj = daio_in_next_conj_20k1, .next_conj = daio_in_next_conj_20k1,
.index = NULL, .index = NULL,
.output_slot = daio_index, .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, .master = daio_master,
.next_conj = daio_in_next_conj_20k2, .next_conj = daio_in_next_conj_20k2,
.index = NULL, .index = NULL,
@ -263,7 +263,7 @@ static int dao_clear_right_input(struct dao *dao)
return 0; return 0;
} }
static struct dao_rsc_ops dao_ops = { static const struct dao_rsc_ops dao_ops = {
.set_spos = dao_spdif_set_spos, .set_spos = dao_spdif_set_spos,
.commit_write = dao_commit_write, .commit_write = dao_commit_write,
.get_spos = dao_spdif_get_spos, .get_spos = dao_spdif_get_spos,
@ -318,7 +318,7 @@ static int dai_commit_write(struct dai *dai)
return 0; 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_srcl = dai_set_srt_srcl,
.set_srt_srcr = dai_set_srt_srcr, .set_srt_srcr = dai_set_srt_srcr,
.set_srt_msr = dai_set_srt_msr, .set_srt_msr = dai_set_srt_msr,

4
sound/pci/ctxfi/ctdaio.h
View File

@ -51,7 +51,7 @@ struct daio {
struct dao { struct dao {
struct daio daio; struct daio daio;
struct dao_rsc_ops *ops; /* DAO specific operations */ const struct dao_rsc_ops *ops; /* DAO specific operations */
struct imapper **imappers; struct imapper **imappers;
struct daio_mgr *mgr; struct daio_mgr *mgr;
struct hw *hw; struct hw *hw;
@ -60,7 +60,7 @@ struct dao {
struct dai { struct dai {
struct daio daio; struct daio daio;
struct dai_rsc_ops *ops; /* DAI specific operations */ const struct dai_rsc_ops *ops; /* DAI specific operations */
struct hw *hw; struct hw *hw;
void *ctrl_blk; void *ctrl_blk;
}; };

2
sound/pci/ctxfi/ctresource.c
View File

@ -127,7 +127,7 @@ static int rsc_master(struct rsc *rsc)
return rsc->conj = rsc->idx; return rsc->conj = rsc->idx;
} }
static struct rsc_ops rsc_generic_ops = { static const struct rsc_ops rsc_generic_ops = {
.index = rsc_index, .index = rsc_index,
.output_slot = audio_ring_slot, .output_slot = audio_ring_slot,
.master = rsc_master, .master = rsc_master,

2
sound/pci/ctxfi/ctresource.h
View File

@ -39,7 +39,7 @@ struct rsc {
u32 msr:4; /* The Master Sample Rate a resource working on */ u32 msr:4; /* The Master Sample Rate a resource working on */
void *ctrl_blk; /* Chip specific control info block for a resource */ void *ctrl_blk; /* Chip specific control info block for a resource */
struct hw *hw; /* Chip specific object for hardware access means */ struct hw *hw; /* Chip specific object for hardware access means */
struct rsc_ops *ops; /* Generic resource operations */ const struct rsc_ops *ops; /* Generic resource operations */
}; };
struct rsc_ops { struct rsc_ops {

6
sound/pci/ctxfi/ctsrc.c
View File

@ -335,7 +335,7 @@ static int src_default_config_arcrw(struct src *src)
return 0; return 0;
} }
static struct src_rsc_ops src_rsc_ops = { static const struct src_rsc_ops src_rsc_ops = {
.set_state = src_set_state, .set_state = src_set_state,
.set_bm = src_set_bm, .set_bm = src_set_bm,
.set_sf = src_set_sf, .set_sf = src_set_sf,
@ -611,7 +611,7 @@ static int srcimp_index(const struct rsc *rsc)
return container_of(rsc, struct srcimp, rsc)->idx[rsc->conj]; return container_of(rsc, struct srcimp, rsc)->idx[rsc->conj];
} }
static struct rsc_ops srcimp_basic_rsc_ops = { static const struct rsc_ops srcimp_basic_rsc_ops = {
.master = srcimp_master, .master = srcimp_master,
.next_conj = srcimp_next_conj, .next_conj = srcimp_next_conj,
.index = srcimp_index, .index = srcimp_index,
@ -662,7 +662,7 @@ static int srcimp_unmap(struct srcimp *srcimp)
return 0; return 0;
} }
static struct srcimp_rsc_ops srcimp_ops = { static const struct srcimp_rsc_ops srcimp_ops = {
.map = srcimp_map, .map = srcimp_map,
.unmap = srcimp_unmap .unmap = srcimp_unmap
}; };

4
sound/pci/ctxfi/ctsrc.h
View File

@ -48,7 +48,7 @@ struct src_rsc_ops;
struct src { struct src {
struct rsc rsc; /* Basic resource info */ struct rsc rsc; /* Basic resource info */
struct src *intlv; /* Pointer to next interleaved SRC in a series */ struct src *intlv; /* Pointer to next interleaved SRC in a series */
struct src_rsc_ops *ops; /* SRC specific operations */ const struct src_rsc_ops *ops; /* SRC specific operations */
/* Number of contiguous srcs for interleaved usage */ /* Number of contiguous srcs for interleaved usage */
unsigned char multi; unsigned char multi;
unsigned char mode; /* Working mode of this SRC resource */ unsigned char mode; /* Working mode of this SRC resource */
@ -110,7 +110,7 @@ struct srcimp {
struct imapper *imappers; struct imapper *imappers;
unsigned int mapped; /* A bit-map indicating which conj rsc is mapped */ unsigned int mapped; /* A bit-map indicating which conj rsc is mapped */
struct srcimp_mgr *mgr; struct srcimp_mgr *mgr;
struct srcimp_rsc_ops *ops; const struct srcimp_rsc_ops *ops;
}; };
struct srcimp_rsc_ops { struct srcimp_rsc_ops {