Merge branch 'topic/misc' into topic/pcsp-fix (e7dd8c1b) · Commits · e / devices / android_kernel_oneplus_sm8150

include/sound/core.h

+25 −3

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ void snd_verbose_printd(const char file, int line, const char format, ...)
		* snd_printk - printk wrapper
		* @fmt: format string
		*
		* Works like print() but prints the file and the line of the caller
		* Works like printk() but prints the file and the line of the caller
		* when configured with CONFIG_SND_VERBOSE_PRINTK.
		*/
		#define snd_printk(fmt, args...) \
		@@ -380,18 +380,40 @@ void snd_verbose_printd(const char file, int line, const char format, ...)
		printk(fmt ,##args)
		#endif

		/**
		* snd_BUG - give a BUG warning message and stack trace
		*
		* Calls WARN() if CONFIG_SND_DEBUG is set.
		* Ignored when CONFIG_SND_DEBUG is not set.
		*/
		#define snd_BUG() WARN(1, "BUG?\n")

		/**
		* snd_BUG_ON - debugging check macro
		* @cond: condition to evaluate
		*
		* When CONFIG_SND_DEBUG is set, this macro evaluates the given condition,
		* and call WARN() and returns the value if it's non-zero.
		*
		* When CONFIG_SND_DEBUG is not set, this just returns zero, and the given
		* condition is ignored.
		*
		* NOTE: the argument won't be evaluated at all when CONFIG_SND_DEBUG=n.
		* Thus, don't put any statement that influences on the code behavior,
		* such as pre/post increment, to the argument of this macro.
		* If you want to evaluate and give a warning, use standard WARN_ON().
		*/
		#define snd_BUG_ON(cond) WARN((cond), "BUG? (%s)\n", __stringify(cond))

		#else /* !CONFIG_SND_DEBUG */

		#define snd_printd(fmt, args...) do { } while (0)
		#define snd_BUG() do { } while (0)
		static inline int __snd_bug_on(void)
		static inline int __snd_bug_on(int cond)
		{
		return 0;
		}
		#define snd_BUG_ON(cond) __snd_bug_on() /* always false */
		#define snd_BUG_ON(cond) __snd_bug_on(0 && (cond)) /* always false */

		#endif /* CONFIG_SND_DEBUG */

include/sound/version.h

+1 −1

Original line number	Diff line number	Diff line
		/* include/version.h */
		#define CONFIG_SND_VERSION "1.0.18rc3"
		#define CONFIG_SND_VERSION "1.0.18a"
		#define CONFIG_SND_DATE ""

sound/core/device.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ int snd_device_free(struct snd_card card, void device_data)
		kfree(dev);
		return 0;
		}
		snd_printd("device free %p (from %p), not found\n", device_data,
		snd_printd("device free %p (from %pF), not found\n", device_data,
		__builtin_return_address(0));
		return -ENXIO;
		}
		@@ -135,7 +135,7 @@ int snd_device_disconnect(struct snd_card card, void device_data)
		}
		return 0;
		}
		snd_printd("device disconnect %p (from %p), not found\n", device_data,
		snd_printd("device disconnect %p (from %pF), not found\n", device_data,
		__builtin_return_address(0));
		return -ENXIO;
		}

sound/drivers/pcsp/pcsp.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)
		return -EINVAL;

		hrtimer_init(&pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
		pcsp_chip.timer.cb_mode = HRTIMER_CB_SOFTIRQ;
		pcsp_chip.timer.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED;
		pcsp_chip.timer.function = pcsp_do_timer;

		card = snd_card_new(index, id, THIS_MODULE, 0);
		@@ -188,10 +188,8 @@ static int __devexit pcsp_remove(struct platform_device *dev)

		static void pcsp_stop_beep(struct snd_pcsp *chip)
		{
		spin_lock_irq(&chip->substream_lock);
		if (!chip->playback_substream)
		pcsp_sync_stop(chip);
		pcspkr_stop_sound();
		spin_unlock_irq(&chip->substream_lock);
		}

		#ifdef CONFIG_PM

sound/drivers/pcsp/pcsp.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ struct snd_pcsp {
		extern struct snd_pcsp pcsp_chip;

		extern enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle);
		extern void pcsp_sync_stop(struct snd_pcsp *chip);

		extern int snd_pcsp_new_pcm(struct snd_pcsp *chip);
		extern int snd_pcsp_new_mixer(struct snd_pcsp *chip);