Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Subject: [alsa-devel] [PATCH 48/58] ALSA: ice17xx: Constify snd_ice1712_card_info
Date: Fri,  3 Jan 2020 09:17:04 +0100
Message-ID: <20200103081714.9560-49-tiwai@suse.de> (raw)
In-Reply-To: <20200103081714.9560-1-tiwai@suse.de>

The snd_ice1712_card_info objects are referred only as read-only.
Let's make them const for further optimization.

There should be no functional changes by this patch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/ice1712/ice1712.c |  6 +++---
 sound/pci/ice1712/ice1712.h |  2 +-
 sound/pci/ice1712/ice1724.c | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 5202e4c06fc4..884d0cdec08c 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2218,7 +2218,7 @@ static const struct snd_kcontrol_new snd_ice1712_mixer_pro_peak = {
 /*
  * list of available boards
  */
-static struct snd_ice1712_card_info *card_tables[] = {
+static const struct snd_ice1712_card_info *card_tables[] = {
 	snd_ice1712_hoontech_cards,
 	snd_ice1712_delta_cards,
 	snd_ice1712_ews_cards,
@@ -2242,7 +2242,7 @@ static int snd_ice1712_read_eeprom(struct snd_ice1712 *ice,
 {
 	int dev = ICE_I2C_EEPROM_ADDR;	/* I2C EEPROM device address */
 	unsigned int i, size;
-	struct snd_ice1712_card_info * const *tbl, *c;
+	const struct snd_ice1712_card_info * const *tbl, *c;
 
 	if (!modelname || !*modelname) {
 		ice->eeprom.subvendor = 0;
@@ -2587,7 +2587,7 @@ static int snd_ice1712_probe(struct pci_dev *pci,
 	struct snd_card *card;
 	struct snd_ice1712 *ice;
 	int pcm_dev = 0, err;
-	struct snd_ice1712_card_info * const *tbl, *c;
+	const struct snd_ice1712_card_info * const *tbl, *c;
 
 	if (dev >= SNDRV_CARDS)
 		return -ENODEV;
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
index 88145708a8a7..cd02710d8271 100644
--- a/sound/pci/ice1712/ice1712.h
+++ b/sound/pci/ice1712/ice1712.h
@@ -316,7 +316,7 @@ struct snd_ice1712 {
 	struct snd_info_entry *proc_entry;
 
 	struct snd_ice1712_eeprom eeprom;
-	struct snd_ice1712_card_info *card_info;
+	const struct snd_ice1712_card_info *card_info;
 
 	unsigned int pro_volumes[20];
 	unsigned int omni:1;		/* Delta Omni I/O */
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 4630a8c42aa9..f4d69b8197ed 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2170,13 +2170,13 @@ static const struct snd_kcontrol_new snd_vt1724_mixer_pro_peak = {
  *
  */
 
-static struct snd_ice1712_card_info no_matched;
+static const struct snd_ice1712_card_info no_matched;
 
 
 /*
   ooAoo cards with no controls
 */
-static unsigned char ooaoo_sq210_eeprom[] = {
+static const unsigned char ooaoo_sq210_eeprom[] = {
 	[ICE_EEP2_SYSCONF]     = 0x4c,	/* 49MHz crystal, no mpu401, no ADC,
 					   1xDACs */
 	[ICE_EEP2_ACLINK]      = 0x80,	/* I2S */
@@ -2196,7 +2196,7 @@ static unsigned char ooaoo_sq210_eeprom[] = {
 };
 
 
-static struct snd_ice1712_card_info snd_vt1724_ooaoo_cards[] = {
+static const struct snd_ice1712_card_info snd_vt1724_ooaoo_cards[] = {
 	{
 		.name = "ooAoo SQ210a",
 		.model = "sq210a",
@@ -2206,7 +2206,7 @@ static struct snd_ice1712_card_info snd_vt1724_ooaoo_cards[] = {
 	{ } /* terminator */
 };
 
-static struct snd_ice1712_card_info *card_tables[] = {
+static const struct snd_ice1712_card_info *card_tables[] = {
 	snd_vt1724_revo_cards,
 	snd_vt1724_amp_cards,
 	snd_vt1724_aureon_cards,
@@ -2276,7 +2276,7 @@ static int snd_vt1724_read_eeprom(struct snd_ice1712 *ice,
 {
 	const int dev = 0xa0;		/* EEPROM device address */
 	unsigned int i, size;
-	struct snd_ice1712_card_info * const *tbl, *c;
+	const struct snd_ice1712_card_info * const *tbl, *c;
 
 	if (!modelname || !*modelname) {
 		ice->eeprom.subvendor = 0;
@@ -2590,7 +2590,7 @@ static int snd_vt1724_probe(struct pci_dev *pci,
 	struct snd_card *card;
 	struct snd_ice1712 *ice;
 	int pcm_dev = 0, err;
-	struct snd_ice1712_card_info * const *tbl, *c;
+	const struct snd_ice1712_card_info * const *tbl, *c;
 
 	if (dev >= SNDRV_CARDS)
 		return -ENODEV;
-- 
2.16.4

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  parent reply index

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-03  8:16 [alsa-devel] [PATCH 00/58] ALSA: Constifications Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 01/58] ALSA: pci: Constify snd_pcm_hardware definitions Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 02/58] ALSA: usb: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 03/58] ALSA: core: Treat snd_device_ops as const Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 04/58] ALSA: core: Constify snd_device_ops definitions Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 05/58] ALSA: drivers: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 06/58] ALSA: i2c: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 07/58] ALSA: isa: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 08/58] ALSA: hda: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 09/58] ALSA: pci: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 10/58] ALSA: usb: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 11/58] ALSA: aoa: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 12/58] ALSA: mips: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 13/58] ALSA: parisc: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 14/58] ALSA: pcmcia: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 15/58] ALSA: ppc: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 16/58] ALSA: sparc: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 17/58] ALSA: sh: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 18/58] ALSA: spi: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 19/58] ALSA: docs: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 20/58] ALSA: timer: Constify snd_timer_hardware definitions Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 21/58] ALSA: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 22/58] ALSA: ac97: Treat snd_ac97_bus_ops as const Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 23/58] ALSA: ac97: Constify snd_ac97_bus_ops definitions Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 24/58] ALSA: arm: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 25/58] ALSA: atmel: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 26/58] ALSA: drivers: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 27/58] ALSA: pci: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 28/58] ALSA: info: Make snd_info_entry_ops as const Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 29/58] ALSA: seq: Constify struct snd_midi_op Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 30/58] ALSA: vx: Constify snd_vx_hardware and snd_vx_ops definitions Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 31/58] ALSA: mixer: oss: Constify snd_mixer_oss_assign_table definition Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 32/58] ALSA: aoa: Constify snd_kcontrol_new items Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 33/58] ALSA: drivers: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 34/58] ALSA: i2c: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 35/58] ALSA: isa: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 36/58] ALSA: hda: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 37/58] ALSA: pci: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 38/58] ALSA: ppc: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 39/58] ALSA: sparc: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 40/58] ALSA: spi: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 41/58] ALSA: usb: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 42/58] ALSA: parisc: " Takashi Iwai
2020-01-03  8:16 ` [alsa-devel] [PATCH 43/58] ALSA: dummy: Constify snd_pcm_ops definitions Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 44/58] ALSA: opl3: Constify snd_opl3_drum_voice definitions Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 45/58] ALSA: ac97: Constify snd_ac97_res_table definition Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 46/58] ALSA: ca0106: Constify snd_ca0106_category_str items Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 47/58] ALSA: ca0106: Constify snd_ca0106_details Takashi Iwai
2020-01-03  8:17 ` Takashi Iwai [this message]
2020-01-03  8:17 ` [alsa-devel] [PATCH 49/58] ALSA: ice1712: Constify wm-specific tables Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 50/58] ALSA: line6: Constify snd_ratden definitions Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 51/58] ALSA: usx2y: Constify struct snd_usb_audio_quirk entries Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 52/58] ALSA: seq: oss: Constify snd_seq_oss_callback definitions Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 53/58] ALSA: bt87x: Constify snd_bt87x_boards Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 54/58] ALSA: emu10k1: Constify snd_emu_chip_details Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 55/58] ALSA: es1968: Constify snd_es1968_tea575x_gpios Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 56/58] ALSA: fm801: Constify snd_fm801_tea575x_gpios Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 57/58] ALSA: hda: Constify snd_pci_quirk tables Takashi Iwai
2020-01-03  8:17 ` [alsa-devel] [PATCH 58/58] ALSA: pci: " Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200103081714.9560-49-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git