From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 4 Oct 2018 05:52:58 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4a9a72e0db5e584267944f4d868f46419b2fab59;p=linux.git

Merge branch 'for-linus' into for-next

Back-merge 4.19-devel branch into 4.20 for applying FireWire patches
cleanly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

4a9a72e0db5e584267944f4d868f46419b2fab59
diff --cc sound/pci/hda/hda_intel.c
index 4e64595b381b2,aa4c672dbaf73..20d10757a9bc5
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -397,7 -399,63 +399,8 @@@ static char *driver_short_names[] = 
  	[AZX_DRIVER_GENERIC] = "HD-Audio Generic",
  };
  
 -#ifdef CONFIG_X86
 -static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on)
 -{
 -	int pages;
 -
 -	if (azx_snoop(chip))
 -		return;
 -	if (!dmab || !dmab->area || !dmab->bytes)
 -		return;
 -
 -#ifdef CONFIG_SND_DMA_SGBUF
 -	if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_SG) {
 -		struct snd_sg_buf *sgbuf = dmab->private_data;
 -		if (chip->driver_type == AZX_DRIVER_CMEDIA)
 -			return; /* deal with only CORB/RIRB buffers */
 -		if (on)
 -			set_pages_array_wc(sgbuf->page_table, sgbuf->pages);
 -		else
 -			set_pages_array_wb(sgbuf->page_table, sgbuf->pages);
 -		return;
 -	}
 -#endif
 -
 -	pages = (dmab->bytes + PAGE_SIZE - 1) >> PAGE_SHIFT;
 -	if (on)
 -		set_memory_wc((unsigned long)dmab->area, pages);
 -	else
 -		set_memory_wb((unsigned long)dmab->area, pages);
 -}
 -
 -static inline void mark_pages_wc(struct azx *chip, struct snd_dma_buffer *buf,
 -				 bool on)
 -{
 -	__mark_pages_wc(chip, buf, on);
 -}
 -static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev,
 -				   struct snd_pcm_substream *substream, bool on)
 -{
 -	if (azx_dev->wc_marked != on) {
 -		__mark_pages_wc(chip, snd_pcm_get_dma_buf(substream), on);
 -		azx_dev->wc_marked = on;
 -	}
 -}
 -#else
 -/* NOP for other archs */
 -static inline void mark_pages_wc(struct azx *chip, struct snd_dma_buffer *buf,
 -				 bool on)
 -{
 -}
 -static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev,
 -				   struct snd_pcm_substream *substream, bool on)
 -{
 -}
 -#endif
 -
  static int azx_acquire_irq(struct azx *chip, int do_disconnect);
+ static void set_default_power_save(struct azx *chip);
  
  /*
   * initialize the PCI registers