diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-09-04 11:10:27 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 11:10:27 +0300 |
| commit | 2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch) | |
| tree | 1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/atmel/ac97c.c | |
| parent | 1f7f51a63114bab3a05920f4b1343154e95e2cb6 (diff) | |
| parent | 39cdc62b1b4efa39831d4de22f990043b0304fff (diff) | |
| download | linux-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/atmel/ac97c.c')
| -rw-r--r-- | sound/atmel/ac97c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 9d2c9d9af688..24623c790773 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -66,7 +66,7 @@ struct atmel_ac97c { #define ac97c_readl(chip, reg) \ __raw_readl((chip)->regs + AC97C_##reg) -static struct snd_pcm_hardware atmel_ac97c_hw = { +static const struct snd_pcm_hardware atmel_ac97c_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED @@ -461,7 +461,7 @@ atmel_ac97c_capture_pointer(struct snd_pcm_substream *substream) return frames; } -static struct snd_pcm_ops atmel_ac97_playback_ops = { +static const struct snd_pcm_ops atmel_ac97_playback_ops = { .open = atmel_ac97c_playback_open, .close = atmel_ac97c_playback_close, .ioctl = snd_pcm_lib_ioctl, @@ -472,7 +472,7 @@ static struct snd_pcm_ops atmel_ac97_playback_ops = { .pointer = atmel_ac97c_playback_pointer, }; -static struct snd_pcm_ops atmel_ac97_capture_ops = { +static const struct snd_pcm_ops atmel_ac97_capture_ops = { .open = atmel_ac97c_capture_open, .close = atmel_ac97c_capture_close, .ioctl = snd_pcm_lib_ioctl, @@ -558,7 +558,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev) return retval; } -static struct ac97_pcm at91_ac97_pcm_defs[] = { +static const struct ac97_pcm at91_ac97_pcm_defs[] = { /* Playback */ { .exclusive = 1, |