Skip to content

Commit 2a32a4d

Browse files
tiwaitiwai
committed
Merge branch 'for-next' into for-linus
2 parents 1f7f51a + 39cdc62 commit 2a32a4d

File tree

169 files changed

+1187
-1074
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+1187
-1074
lines changed

‎include/sound/core.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ struct snd_card {
118118
int user_ctl_count; /* count of all user controls */
119119
struct list_head controls; /* all controls for this card */
120120
struct list_head ctl_files; /* active control files */
121-
struct mutex user_ctl_lock; /* protects user controls against
122-
concurrent access */
123121

124122
struct snd_info_entry *proc_root; /* root for soundcard specific files */
125123
struct snd_info_entry *proc_id; /* the card id */
@@ -138,7 +136,6 @@ struct snd_card {
138136

139137
#ifdef CONFIG_PM
140138
unsigned int power_state; /* power state */
141-
struct mutex power_lock; /* power lock */
142139
wait_queue_head_t power_sleep;
143140
#endif
144141

@@ -151,16 +148,6 @@ struct snd_card {
151148
#define dev_to_snd_card(p) container_of(p, struct snd_card, card_dev)
152149

153150
#ifdef CONFIG_PM
154-
static inline void snd_power_lock(struct snd_card *card)
155-
{
156-
mutex_lock(&card->power_lock);
157-
}
158-
159-
static inline void snd_power_unlock(struct snd_card *card)
160-
{
161-
mutex_unlock(&card->power_lock);
162-
}
163-
164151
static inline unsigned int snd_power_get_state(struct snd_card *card)
165152
{
166153
return card->power_state;
@@ -177,8 +164,6 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state);
177164

178165
#else /* ! CONFIG_PM */
179166

180-
#define snd_power_lock(card) do { (void)(card); } while (0)
181-
#define snd_power_unlock(card) do { (void)(card); } while (0)
182167
static inline int snd_power_wait(struct snd_card *card, unsigned int state) { return 0; }
183168
#define snd_power_get_state(card) ({ (void)(card); SNDRV_CTL_POWER_D0; })
184169
#define snd_power_change_state(card, state) do { (void)(card); } while (0)

‎sound/aoa/codecs/onyx.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ static int onyx_snd_vol_put(struct snd_kcontrol *kcontrol,
167167
return 1;
168168
}
169169

170-
static struct snd_kcontrol_new volume_control = {
170+
static const struct snd_kcontrol_new volume_control = {
171171
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
172172
.name = "Master Playback Volume",
173173
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -229,7 +229,7 @@ static int onyx_snd_inputgain_put(struct snd_kcontrol *kcontrol,
229229
return n != v;
230230
}
231231

232-
static struct snd_kcontrol_new inputgain_control = {
232+
static const struct snd_kcontrol_new inputgain_control = {
233233
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
234234
.name = "Master Capture Volume",
235235
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -284,7 +284,7 @@ static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol,
284284
return 1;
285285
}
286286

287-
static struct snd_kcontrol_new capture_source_control = {
287+
static const struct snd_kcontrol_new capture_source_control = {
288288
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
289289
/* If we name this 'Input Source', it properly shows up in
290290
* alsamixer as a selection, * but it's shown under the
@@ -348,7 +348,7 @@ static int onyx_snd_mute_put(struct snd_kcontrol *kcontrol,
348348
return !err ? (v != c) : err;
349349
}
350350

351-
static struct snd_kcontrol_new mute_control = {
351+
static const struct snd_kcontrol_new mute_control = {
352352
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
353353
.name = "Master Playback Switch",
354354
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -476,7 +476,7 @@ static int onyx_spdif_mask_get(struct snd_kcontrol *kcontrol,
476476
return 0;
477477
}
478478

479-
static struct snd_kcontrol_new onyx_spdif_mask = {
479+
static const struct snd_kcontrol_new onyx_spdif_mask = {
480480
.access = SNDRV_CTL_ELEM_ACCESS_READ,
481481
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
482482
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
@@ -533,7 +533,7 @@ static int onyx_spdif_put(struct snd_kcontrol *kcontrol,
533533
return 1;
534534
}
535535

536-
static struct snd_kcontrol_new onyx_spdif_ctrl = {
536+
static const struct snd_kcontrol_new onyx_spdif_ctrl = {
537537
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
538538
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
539539
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),

‎sound/aoa/codecs/tas.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,8 @@ static int tas_i2c_probe(struct i2c_client *client,
905905
goto fail;
906906
}
907907
printk(KERN_DEBUG
908-
"snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n",
909-
(unsigned int)client->addr, node->full_name);
908+
"snd-aoa-codec-tas: tas found, addr 0x%02x on %pOF\n",
909+
(unsigned int)client->addr, node);
910910
return 0;
911911
fail:
912912
mutex_destroy(&tas->mtx);

‎sound/aoa/soundbus/i2sbus/pcm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ static snd_pcm_uframes_t i2sbus_playback_pointer(struct snd_pcm_substream
778778
return i2sbus_pcm_pointer(i2sdev, 0);
779779
}
780780

781-
static struct snd_pcm_ops i2sbus_playback_ops = {
781+
static const struct snd_pcm_ops i2sbus_playback_ops = {
782782
.open = i2sbus_playback_open,
783783
.close = i2sbus_playback_close,
784784
.ioctl = snd_pcm_lib_ioctl,
@@ -848,7 +848,7 @@ static snd_pcm_uframes_t i2sbus_record_pointer(struct snd_pcm_substream
848848
return i2sbus_pcm_pointer(i2sdev, 1);
849849
}
850850

851-
static struct snd_pcm_ops i2sbus_record_ops = {
851+
static const struct snd_pcm_ops i2sbus_record_ops = {
852852
.open = i2sbus_record_open,
853853
.close = i2sbus_record_close,
854854
.ioctl = snd_pcm_lib_ioctl,

‎sound/arm/aaci.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ static irqreturn_t aaci_irq(int irq, void *devid)
348348
/*
349349
* ALSA support.
350350
*/
351-
static struct snd_pcm_hardware aaci_hw_info = {
351+
static const struct snd_pcm_hardware aaci_hw_info = {
352352
.info = SNDRV_PCM_INFO_MMAP |
353353
SNDRV_PCM_INFO_MMAP_VALID |
354354
SNDRV_PCM_INFO_INTERLEAVED |
@@ -635,7 +635,7 @@ static int aaci_pcm_playback_trigger(struct snd_pcm_substream *substream, int cm
635635
return ret;
636636
}
637637

638-
static struct snd_pcm_ops aaci_playback_ops = {
638+
static const struct snd_pcm_ops aaci_playback_ops = {
639639
.open = aaci_pcm_open,
640640
.close = aaci_pcm_close,
641641
.ioctl = snd_pcm_lib_ioctl,
@@ -738,7 +738,7 @@ static int aaci_pcm_capture_prepare(struct snd_pcm_substream *substream)
738738
return 0;
739739
}
740740

741-
static struct snd_pcm_ops aaci_capture_ops = {
741+
static const struct snd_pcm_ops aaci_capture_ops = {
742742
.open = aaci_pcm_open,
743743
.close = aaci_pcm_close,
744744
.ioctl = snd_pcm_lib_ioctl,
@@ -786,7 +786,7 @@ static SIMPLE_DEV_PM_OPS(aaci_dev_pm_ops, aaci_suspend, aaci_resume);
786786
#endif
787787

788788

789-
static struct ac97_pcm ac97_defs[] = {
789+
static const struct ac97_pcm ac97_defs[] = {
790790
[0] = { /* Front PCM */
791791
.exclusive = 1,
792792
.r = {

‎sound/arm/pxa2xx-pcm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static int pxa2xx_pcm_close(struct snd_pcm_substream *substream)
6868
return __pxa2xx_pcm_close(substream);
6969
}
7070

71-
static struct snd_pcm_ops pxa2xx_pcm_ops = {
71+
static const struct snd_pcm_ops pxa2xx_pcm_ops = {
7272
.open = pxa2xx_pcm_open,
7373
.close = pxa2xx_pcm_close,
7474
.ioctl = snd_pcm_lib_ioctl,

‎sound/atmel/ac97c.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct atmel_ac97c {
6666
#define ac97c_readl(chip, reg) \
6767
__raw_readl((chip)->regs + AC97C_##reg)
6868

69-
static struct snd_pcm_hardware atmel_ac97c_hw = {
69+
static const struct snd_pcm_hardware atmel_ac97c_hw = {
7070
.info = (SNDRV_PCM_INFO_MMAP
7171
| SNDRV_PCM_INFO_MMAP_VALID
7272
| SNDRV_PCM_INFO_INTERLEAVED
@@ -461,7 +461,7 @@ atmel_ac97c_capture_pointer(struct snd_pcm_substream *substream)
461461
return frames;
462462
}
463463

464-
static struct snd_pcm_ops atmel_ac97_playback_ops = {
464+
static const struct snd_pcm_ops atmel_ac97_playback_ops = {
465465
.open = atmel_ac97c_playback_open,
466466
.close = atmel_ac97c_playback_close,
467467
.ioctl = snd_pcm_lib_ioctl,
@@ -472,7 +472,7 @@ static struct snd_pcm_ops atmel_ac97_playback_ops = {
472472
.pointer = atmel_ac97c_playback_pointer,
473473
};
474474

475-
static struct snd_pcm_ops atmel_ac97_capture_ops = {
475+
static const struct snd_pcm_ops atmel_ac97_capture_ops = {
476476
.open = atmel_ac97c_capture_open,
477477
.close = atmel_ac97c_capture_close,
478478
.ioctl = snd_pcm_lib_ioctl,
@@ -558,7 +558,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
558558
return retval;
559559
}
560560

561-
static struct ac97_pcm at91_ac97_pcm_defs[] = {
561+
static const struct ac97_pcm at91_ac97_pcm_defs[] = {
562562
/* Playback */
563563
{
564564
.exclusive = 1,

0 commit comments

Comments
 (0)