Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a32a4d9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus

parents 1f7f51a6 39cdc62b

include/sound/core.h

+0 −15
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ struct snd_card { 
	int user_ctl_count;		/* count of all user controls */

	struct list_head controls;	/* all controls for this card */

	struct list_head ctl_files;	/* active control files */

	struct mutex user_ctl_lock;	/* protects user controls against

					   concurrent access */



	struct snd_info_entry *proc_root;	/* root for soundcard specific files */

	struct snd_info_entry *proc_id;	/* the card id */
@@ -138,7 +136,6 @@ struct snd_card { 


#ifdef CONFIG_PM

	unsigned int power_state;	/* power state */

	struct mutex power_lock;	/* power lock */

	wait_queue_head_t power_sleep;

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



#ifdef CONFIG_PM

static inline void snd_power_lock(struct snd_card *card)

{

	mutex_lock(&card->power_lock);

}



static inline void snd_power_unlock(struct snd_card *card)

{

	mutex_unlock(&card->power_lock);

}



static inline unsigned int snd_power_get_state(struct snd_card *card)

{

	return card->power_state;
@@ -177,8 +164,6 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state); 


#else /* ! CONFIG_PM */



#define snd_power_lock(card)		do { (void)(card); } while (0)

#define snd_power_unlock(card)		do { (void)(card); } while (0)

static inline int snd_power_wait(struct snd_card *card, unsigned int state) { return 0; }

#define snd_power_get_state(card)	({ (void)(card); SNDRV_CTL_POWER_D0; })

#define snd_power_change_state(card, state)	do { (void)(card); } while (0)

sound/aoa/codecs/onyx.c

+6 −6
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int onyx_snd_vol_put(struct snd_kcontrol *kcontrol, 
	return 1;

}



static struct snd_kcontrol_new volume_control = {

static const struct snd_kcontrol_new volume_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Master Playback Volume",

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -229,7 +229,7 @@ static int onyx_snd_inputgain_put(struct snd_kcontrol *kcontrol, 
	return n != v;

}



static struct snd_kcontrol_new inputgain_control = {

static const struct snd_kcontrol_new inputgain_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Master Capture Volume",

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -284,7 +284,7 @@ static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol, 
	return 1;

}



static struct snd_kcontrol_new capture_source_control = {

static const struct snd_kcontrol_new capture_source_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	/* If we name this 'Input Source', it properly shows up in

	 * alsamixer as a selection, * but it's shown under the
@@ -348,7 +348,7 @@ static int onyx_snd_mute_put(struct snd_kcontrol *kcontrol, 
	return !err ? (v != c) : err;

}



static struct snd_kcontrol_new mute_control = {

static const struct snd_kcontrol_new mute_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Master Playback Switch",

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -476,7 +476,7 @@ static int onyx_spdif_mask_get(struct snd_kcontrol *kcontrol, 
	return 0;

}



static struct snd_kcontrol_new onyx_spdif_mask = {

static const struct snd_kcontrol_new onyx_spdif_mask = {

	.access =	SNDRV_CTL_ELEM_ACCESS_READ,

	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
@@ -533,7 +533,7 @@ static int onyx_spdif_put(struct snd_kcontrol *kcontrol, 
	return 1;

}



static struct snd_kcontrol_new onyx_spdif_ctrl = {

static const struct snd_kcontrol_new onyx_spdif_ctrl = {

	.access =	SNDRV_CTL_ELEM_ACCESS_READWRITE,

	.iface =	SNDRV_CTL_ELEM_IFACE_PCM,

	.name =		SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),

sound/aoa/codecs/tas.c

+2 −2
Original line number Diff line number Diff line
@@ -905,8 +905,8 @@ static int tas_i2c_probe(struct i2c_client *client, 
		goto fail;

	}

	printk(KERN_DEBUG

	       "snd-aoa-codec-tas: tas found, addr 0x%02x on %s\n",

	       (unsigned int)client->addr, node->full_name);

	       "snd-aoa-codec-tas: tas found, addr 0x%02x on %pOF\n",

	       (unsigned int)client->addr, node);

	return 0;

 fail:

	mutex_destroy(&tas->mtx);

sound/aoa/soundbus/i2sbus/pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static snd_pcm_uframes_t i2sbus_playback_pointer(struct snd_pcm_substream 
	return i2sbus_pcm_pointer(i2sdev, 0);

}



static struct snd_pcm_ops i2sbus_playback_ops = {

static const struct snd_pcm_ops i2sbus_playback_ops = {

	.open =		i2sbus_playback_open,

	.close =	i2sbus_playback_close,

	.ioctl =	snd_pcm_lib_ioctl,
@@ -848,7 +848,7 @@ static snd_pcm_uframes_t i2sbus_record_pointer(struct snd_pcm_substream 
	return i2sbus_pcm_pointer(i2sdev, 1);

}



static struct snd_pcm_ops i2sbus_record_ops = {

static const struct snd_pcm_ops i2sbus_record_ops = {

	.open =		i2sbus_record_open,

	.close =	i2sbus_record_close,

	.ioctl =	snd_pcm_lib_ioctl,

sound/arm/aaci.c

+4 −4
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static irqreturn_t aaci_irq(int irq, void *devid) 
/*

 * ALSA support.

 */

static struct snd_pcm_hardware aaci_hw_info = {

static const struct snd_pcm_hardware aaci_hw_info = {

	.info			= SNDRV_PCM_INFO_MMAP |

				  SNDRV_PCM_INFO_MMAP_VALID |

				  SNDRV_PCM_INFO_INTERLEAVED |
@@ -635,7 +635,7 @@ static int aaci_pcm_playback_trigger(struct snd_pcm_substream *substream, int cm 
	return ret;

}



static struct snd_pcm_ops aaci_playback_ops = {

static const struct snd_pcm_ops aaci_playback_ops = {

	.open		= aaci_pcm_open,

	.close		= aaci_pcm_close,

	.ioctl		= snd_pcm_lib_ioctl,
@@ -738,7 +738,7 @@ static int aaci_pcm_capture_prepare(struct snd_pcm_substream *substream) 
	return 0;

}



static struct snd_pcm_ops aaci_capture_ops = {

static const struct snd_pcm_ops aaci_capture_ops = {

	.open		= aaci_pcm_open,

	.close		= aaci_pcm_close,

	.ioctl		= snd_pcm_lib_ioctl,
@@ -786,7 +786,7 @@ static SIMPLE_DEV_PM_OPS(aaci_dev_pm_ops, aaci_suspend, aaci_resume); 
#endif





static struct ac97_pcm ac97_defs[] = {

static const struct ac97_pcm ac97_defs[] = {

	[0] = {	/* Front PCM */

		.exclusive = 1,

		.r = {