ALSA: opti9xx: More constifications

Apply const prefix to the static resource tables, the mc size tables
and the string arrays.

Just for minor optimization and no functional changes.

Link: https://lore.kernel.org/r/20200105144823.29547-51-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index a9c773b..e764816 100644 (file)
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -119,7 +119,7 @@ struct snd_miro {
 
 static struct snd_miro_aci aci_device;
 
-static char * snd_opti9xx_names[] = {
+static const char * const snd_opti9xx_names[] = {
        "unknown",
        "82C928", "82C929",
        "82C924", "82C925",
@@ -637,7 +637,7 @@ static const struct snd_kcontrol_new snd_miro_capture_control[] = {
        .put = snd_miro_put_capture,
 }};
 
-static unsigned char aci_init_values[][2] = {
+static const unsigned char aci_init_values[][2] = {
        { ACI_SET_MUTE, 0x00 },
        { ACI_SET_POWERAMP, 0x00 },
        { ACI_SET_PREAMP, 0x00 },
@@ -764,7 +764,7 @@ static int snd_miro_mixer(struct snd_card *card,
 static int snd_miro_init(struct snd_miro *chip,
                         unsigned short hardware)
 {
-       static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
+       static const int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
 
        chip->hardware = hardware;
        strcpy(chip->name, snd_opti9xx_names[hardware]);
@@ -1387,12 +1387,12 @@ static int snd_miro_isa_match(struct device *devptr, unsigned int n)
 
 static int snd_miro_isa_probe(struct device *devptr, unsigned int n)
 {
-       static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
-       static long possible_mpu_ports[] = {0x330, 0x300, 0x310, 0x320, -1};
-       static int possible_irqs[] = {11, 9, 10, 7, -1};
-       static int possible_mpu_irqs[] = {10, 5, 9, 7, -1};
-       static int possible_dma1s[] = {3, 1, 0, -1};
-       static int possible_dma2s[][2] = { {1, -1}, {0, -1}, {-1, -1},
+       static const long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
+       static const long possible_mpu_ports[] = {0x330, 0x300, 0x310, 0x320, -1};
+       static const int possible_irqs[] = {11, 9, 10, 7, -1};
+       static const int possible_mpu_irqs[] = {10, 5, 9, 7, -1};
+       static const int possible_dma1s[] = {3, 1, 0, -1};
+       static const int possible_dma2s[][2] = { {1, -1}, {0, -1}, {-1, -1},
                                           {0, -1} };
 
        int error;

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 6975764..d06b296 100644 (file)
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -163,7 +163,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_opti9xx_pnpids);
 
 #define DEV_NAME KBUILD_MODNAME
 
-static char * snd_opti9xx_names[] = {
+static const char * const snd_opti9xx_names[] = {
        "unknown",
        "82C928",       "82C929",
        "82C924",       "82C925",
@@ -173,7 +173,7 @@ static char * snd_opti9xx_names[] = {
 static int snd_opti9xx_init(struct snd_opti9xx *chip,
                            unsigned short hardware)
 {
-       static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
+       static const int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
 
        chip->hardware = hardware;
        strcpy(chip->name, snd_opti9xx_names[hardware]);
@@ -808,7 +808,7 @@ static void snd_card_opti9xx_free(struct snd_card *card)
 
 static int snd_opti9xx_probe(struct snd_card *card)
 {
-       static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
+       static const long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
        int error;
        int xdma2;
        struct snd_opti9xx *chip = card->private_data;
@@ -958,16 +958,16 @@ static int snd_opti9xx_isa_probe(struct device *devptr,
 {
        struct snd_card *card;
        int error;
-       static long possible_mpu_ports[] = {0x300, 0x310, 0x320, 0x330, -1};
+       static const long possible_mpu_ports[] = {0x300, 0x310, 0x320, 0x330, -1};
 #ifdef OPTi93X
-       static int possible_irqs[] = {5, 9, 10, 11, 7, -1};
+       static const int possible_irqs[] = {5, 9, 10, 11, 7, -1};
 #else
-       static int possible_irqs[] = {9, 10, 11, 7, -1};
+       static const int possible_irqs[] = {9, 10, 11, 7, -1};
 #endif /* OPTi93X */
-       static int possible_mpu_irqs[] = {5, 9, 10, 7, -1};
-       static int possible_dma1s[] = {3, 1, 0, -1};
+       static const int possible_mpu_irqs[] = {5, 9, 10, 7, -1};
+       static const int possible_dma1s[] = {3, 1, 0, -1};
 #if defined(CS4231) || defined(OPTi93X)
-       static int possible_dma2s[][2] = {{1,-1}, {0,-1}, {-1,-1}, {0,-1}};
+       static const int possible_dma2s[][2] = {{1,-1}, {0,-1}, {-1,-1}, {0,-1}};
 #endif /* CS4231 || OPTi93X */
 
        if (mpu_port == SNDRV_AUTO_PORT) {