Merge branch 'for-linus' into for-next (4a1e6ac7) · Commits · git / linux-net

MAINTAINERS

+8 −3

Original line number	Diff line number	Diff line
		@@ -9811,7 +9811,10 @@ INTEL ASoC DRIVERS
		M: Cezary Rojewski <cezary.rojewski@intel.com>
		M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
		M: Liam Girdwood <liam.r.girdwood@linux.intel.com>
		M: Jie Yang <yang.jie@linux.intel.com>
		M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
		M: Bard Liao <yung-chuan.liao@linux.intel.com>
		M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
		M: Kai Vehmanen <kai.vehmanen@linux.intel.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Supported
		F: sound/soc/intel/
		@@ -16261,7 +16264,7 @@ F: drivers/crypto/qat/

		QCOM AUDIO (ASoC) DRIVERS
		M: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
		M: Banajit Goswami <bgoswami@codeaurora.org>
		M: Banajit Goswami <bgoswami@quicinc.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Supported
		F: sound/soc/codecs/lpass-va-macro.c
		@@ -18687,8 +18690,10 @@ F: sound/soc/
		SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS
		M: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
		M: Liam Girdwood <lgirdwood@gmail.com>
		M: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
		M: Bard Liao <yung-chuan.liao@linux.intel.com>
		M: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
		M: Kai Vehmanen <kai.vehmanen@linux.intel.com>
		R: Kai Vehmanen <kai.vehmanen@linux.intel.com>
		M: Daniel Baluta <daniel.baluta@nxp.com>
		L: sound-open-firmware@alsa-project.org (moderated for non-subscribers)
		S: Supported

drivers/firewire/core-cdev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1211,7 +1211,7 @@ static int ioctl_get_cycle_timer2(struct client client, union ioctl_arg arg)
		struct fw_cdev_get_cycle_timer2 *a = &arg->get_cycle_timer2;
		struct fw_card *card = client->device->card;
		struct timespec64 ts = {0, 0};
		u32 cycle_time;
		u32 cycle_time = 0;
		int ret = 0;

		local_irq_disable();

drivers/firewire/core-device.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -372,8 +372,7 @@ static ssize_t rom_index_show(struct device *dev,
		struct fw_device *device = fw_device(dev->parent);
		struct fw_unit *unit = fw_unit(dev);

		return snprintf(buf, PAGE_SIZE, "%d\n",
		(int)(unit->directory - device->config_rom));
		return sysfs_emit(buf, "%td\n", unit->directory - device->config_rom);
		}

		static struct device_attribute fw_unit_attributes[] = {
		@@ -403,8 +402,7 @@ static ssize_t guid_show(struct device *dev,
		int ret;

		down_read(&fw_device_rwsem);
		ret = snprintf(buf, PAGE_SIZE, "0x%08x%08x\n",
		device->config_rom[3], device->config_rom[4]);
		ret = sysfs_emit(buf, "0x%08x%08x\n", device->config_rom[3], device->config_rom[4]);
		up_read(&fw_device_rwsem);

		return ret;

include/sound/soc.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -408,8 +408,6 @@ struct snd_soc_jack_pin;

		struct snd_soc_jack_gpio;

		typedef int (hw_write_t)(void ,const char* ,int);

		enum snd_soc_pcm_subclass {
		SND_SOC_PCM_CLASS_PCM = 0,
		SND_SOC_PCM_CLASS_BE = 1,

sound/core/memalloc.c

+1 −22

Original line number	Diff line number	Diff line
		@@ -431,33 +431,17 @@ static const struct snd_malloc_ops snd_dma_iram_ops = {
		*/
		static void snd_dma_dev_alloc(struct snd_dma_buffer dmab, size_t size)
		{
		void *p;

		p = dma_alloc_coherent(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP);
		#ifdef CONFIG_X86
		if (p && dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC)
		set_memory_wc((unsigned long)p, PAGE_ALIGN(size) >> PAGE_SHIFT);
		#endif
		return p;
		return dma_alloc_coherent(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP);
		}

		static void snd_dma_dev_free(struct snd_dma_buffer *dmab)
		{
		#ifdef CONFIG_X86
		if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC)
		set_memory_wb((unsigned long)dmab->area,
		PAGE_ALIGN(dmab->bytes) >> PAGE_SHIFT);
		#endif
		dma_free_coherent(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
		}

		static int snd_dma_dev_mmap(struct snd_dma_buffer *dmab,
		struct vm_area_struct *area)
		{
		#ifdef CONFIG_X86
		if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC)
		area->vm_page_prot = pgprot_writecombine(area->vm_page_prot);
		#endif
		return dma_mmap_coherent(dmab->dev.dev, area,
		dmab->area, dmab->addr, dmab->bytes);
		}
		@@ -471,10 +455,6 @@ static const struct snd_malloc_ops snd_dma_dev_ops = {
		/*
		* Write-combined pages
		*/
		#ifdef CONFIG_X86
		/* On x86, share the same ops as the standard dev ops */
		#define snd_dma_wc_ops snd_dma_dev_ops
		#else /* CONFIG_X86 */
		static void snd_dma_wc_alloc(struct snd_dma_buffer dmab, size_t size)
		{
		return dma_alloc_wc(dmab->dev.dev, size, &dmab->addr, DEFAULT_GFP);
		@@ -497,7 +477,6 @@ static const struct snd_malloc_ops snd_dma_wc_ops = {
		.free = snd_dma_wc_free,
		.mmap = snd_dma_wc_mmap,
		};
		#endif /* CONFIG_X86 */

		#ifdef CONFIG_SND_DMA_SGBUF
		static void snd_dma_sg_fallback_alloc(struct snd_dma_buffer dmab, size_t size);