Skip to content

Commit

Permalink
ALSA: info: Make snd_info_entry_ops as const
Browse files Browse the repository at this point in the history
The reference to snd_info_entry_ops is rather read-only, so declare it
as a const pointer.  This allows a bit more optimization.

There should be no functional changes by this patch.

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Jan 3, 2020
1 parent 51055da commit d25ff26
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Documentation/sound/kernel-api/writing-an-alsa-driver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3912,7 +3912,7 @@ For a raw-data proc-file, set the attributes as follows:

::

static struct snd_info_entry_ops my_file_io_ops = {
static const struct snd_info_entry_ops my_file_io_ops = {
.read = my_file_io_read,
};

Expand Down
2 changes: 1 addition & 1 deletion include/sound/info.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct snd_info_entry {
unsigned short content;
union {
struct snd_info_entry_text text;
struct snd_info_entry_ops *ops;
const struct snd_info_entry_ops *ops;
} c;
struct snd_info_entry *parent;
struct module *module;
Expand Down
2 changes: 1 addition & 1 deletion sound/drivers/opl4/opl4_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static ssize_t snd_opl4_mem_proc_write(struct snd_info_entry *entry,
return count;
}

static struct snd_info_entry_ops snd_opl4_mem_proc_ops = {
static const struct snd_info_entry_ops snd_opl4_mem_proc_ops = {
.open = snd_opl4_mem_proc_open,
.release = snd_opl4_mem_proc_release,
.read = snd_opl4_mem_proc_read,
Expand Down
2 changes: 1 addition & 1 deletion sound/isa/gus/gus_mem_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static void snd_gf1_mem_proc_free(struct snd_info_entry *entry)
kfree(priv);
}

static struct snd_info_entry_ops snd_gf1_mem_proc_ops = {
static const struct snd_info_entry_ops snd_gf1_mem_proc_ops = {
.read = snd_gf1_mem_proc_dump,
};

Expand Down
4 changes: 2 additions & 2 deletions sound/pci/cs4281.c
Original file line number Diff line number Diff line change
Expand Up @@ -1129,11 +1129,11 @@ static ssize_t snd_cs4281_BA1_read(struct snd_info_entry *entry,
return count;
}

static struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
static const struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
.read = snd_cs4281_BA0_read,
};

static struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {
static const struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {
.read = snd_cs4281_BA1_read,
};

Expand Down
2 changes: 1 addition & 1 deletion sound/pci/cs46xx/cs46xx_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -2815,7 +2815,7 @@ static ssize_t snd_cs46xx_io_read(struct snd_info_entry *entry,
return count;
}

static struct snd_info_entry_ops snd_cs46xx_proc_io_ops = {
static const struct snd_info_entry_ops snd_cs46xx_proc_io_ops = {
.read = snd_cs46xx_io_read,
};

Expand Down
2 changes: 1 addition & 1 deletion sound/pci/emu10k1/emuproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ static void snd_emu_proc_ptr_reg_read20c(struct snd_info_entry *entry,
}
#endif

static struct snd_info_entry_ops snd_emu10k1_proc_ops_fx8010 = {
static const struct snd_info_entry_ops snd_emu10k1_proc_ops_fx8010 = {
.read = snd_emu10k1_fx8010_read,
};

Expand Down
4 changes: 2 additions & 2 deletions sound/pci/mixart/mixart.c
Original file line number Diff line number Diff line change
Expand Up @@ -1153,11 +1153,11 @@ static ssize_t snd_mixart_BA1_read(struct snd_info_entry *entry,
return count;
}

static struct snd_info_entry_ops snd_mixart_proc_ops_BA0 = {
static const struct snd_info_entry_ops snd_mixart_proc_ops_BA0 = {
.read = snd_mixart_BA0_read,
};

static struct snd_info_entry_ops snd_mixart_proc_ops_BA1 = {
static const struct snd_info_entry_ops snd_mixart_proc_ops_BA1 = {
.read = snd_mixart_BA1_read,
};

Expand Down

0 comments on commit d25ff26

Please sign in to comment.