Merge branch 'for-next' into for-linus (4dda3a19) · Commits · 戴 / test

include/drm/drm_audio_component.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,10 @@ struct drm_audio_component {
		* @audio_ops: Ops implemented by hda driver, called by DRM driver
		*/
		const struct drm_audio_component_audio_ops *audio_ops;
		/**
		* @master_bind_complete: completion held during component master binding
		*/
		struct completion master_bind_complete;
		};

		#endif /* _DRM_AUDIO_COMPONENT_H_ */

include/sound/pcm_params.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -23,11 +23,6 @@ int snd_pcm_hw_param_value(const struct snd_pcm_hw_params *params,
		#define MASK_OFS(i) ((i) >> 5)
		#define MASK_BIT(i) (1U << ((i) & 31))

		static inline size_t snd_mask_sizeof(void)
		{
		return sizeof(struct snd_mask);
		}

		static inline void snd_mask_none(struct snd_mask *mask)
		{
		memset(mask, 0, sizeof(*mask));

include/sound/timer.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -21,13 +21,13 @@
		#define SNDRV_TIMER_HW_STOP 0x00000002 /* call stop before start */
		#define SNDRV_TIMER_HW_SLAVE 0x00000004 /* only slave timer (variable resolution) */
		#define SNDRV_TIMER_HW_FIRST 0x00000008 /* first tick can be incomplete */
		#define SNDRV_TIMER_HW_TASKLET 0x00000010 /* timer is called from tasklet */
		#define SNDRV_TIMER_HW_WORK 0x00000010 /* timer is called from work */

		#define SNDRV_TIMER_IFLG_SLAVE 0x00000001
		#define SNDRV_TIMER_IFLG_RUNNING 0x00000002
		#define SNDRV_TIMER_IFLG_START 0x00000004
		#define SNDRV_TIMER_IFLG_AUTO 0x00000008 /* auto restart */
		#define SNDRV_TIMER_IFLG_FAST 0x00000010 /* fast callback (do not use tasklet) */
		#define SNDRV_TIMER_IFLG_FAST 0x00000010 /* fast callback (do not use work) */
		#define SNDRV_TIMER_IFLG_CALLBACK 0x00000020 /* timer callback is active */
		#define SNDRV_TIMER_IFLG_EXCLUSIVE 0x00000040 /* exclusive owner - no more instances */
		#define SNDRV_TIMER_IFLG_EARLY_EVENT 0x00000080 /* write early event to the poll queue */
		@@ -74,7 +74,7 @@ struct snd_timer {
		struct list_head active_list_head;
		struct list_head ack_list_head;
		struct list_head sack_list_head; /* slow ack list head */
		struct tasklet_struct task_queue;
		struct work_struct task_work;
		int max_instances; /* upper limit of timer instances */
		int num_instances; /* current number of timer instances */
		};
		@@ -96,7 +96,7 @@ struct snd_timer_instance {
		unsigned long ticks; /* auto-load ticks when expired */
		unsigned long cticks; /* current ticks */
		unsigned long pticks; /* accumulated ticks for callback */
		unsigned long resolution; /* current resolution for tasklet */
		unsigned long resolution; /* current resolution for work */
		unsigned long lost; /* lost ticks */
		int slave_class;
		unsigned int slave_id;

sound/ac97/ac97_core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		* Copyright (C) 2016 Robert Jarzmik <robert.jarzmik@free.fr>
		*/

		unsigned int snd_ac97_bus_scan_one(struct ac97_controller *ac97,
		unsigned int snd_ac97_bus_scan_one(struct ac97_controller *adrv,
		unsigned int codec_num);

		static inline bool ac97_ids_match(unsigned int id1, unsigned int id2,

sound/aoa/soundbus/i2sbus/pcm.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -254,12 +254,11 @@ static void i2sbus_wait_for_stop(struct i2sbus_dev *i2sdev,
		struct pcm_info *pi)
		{
		unsigned long flags;
		struct completion done;
		DECLARE_COMPLETION_ONSTACK(done);
		long timeout;

		spin_lock_irqsave(&i2sdev->low_lock, flags);
		if (pi->dbdma_ring.stopping) {
		init_completion(&done);
		pi->stop_completion = &done;
		spin_unlock_irqrestore(&i2sdev->low_lock, flags);
		timeout = wait_for_completion_timeout(&done, HZ);

Admin message