diff options
| author | Dylan Reid | 2014-03-03 05:44:00 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2014-03-03 09:53:21 +0100 |
| commit | 778bde6f59e062a44df5e82646db71c9ef84c18a (patch) | |
| tree | f83ce3c3edc931d77d615b83920c7e7f970cccdd /sound/pci/hda/hda_intel.c | |
| parent | ALSA: hda - Make azx_attach_pcm_stream static (diff) | |
| download | kernel-qcow2-linux-778bde6f59e062a44df5e82646db71c9ef84c18a.tar.gz kernel-qcow2-linux-778bde6f59e062a44df5e82646db71c9ef84c18a.tar.xz kernel-qcow2-linux-778bde6f59e062a44df5e82646db71c9ef84c18a.zip | |
ALSA: hda - Rename reg access ops in hda_controller_ops
Using readl, writel, etc. resulted in some architectures, such as
s390, expanding the member names into zpci_writel. Obviously not the
intended result.
Fixes s390 build breakage introduced by "4083081 - ALSA: hda - Allow
different ops to read/write registers"
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b26eff3edfc1..149c00b00320 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1537,12 +1537,12 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream, } static const struct hda_controller_ops pci_hda_ops = { - .writel = pci_azx_writel, - .readl = pci_azx_readl, - .writew = pci_azx_writew, - .readw = pci_azx_readw, - .writeb = pci_azx_writeb, - .readb = pci_azx_readb, + .reg_writel = pci_azx_writel, + .reg_readl = pci_azx_readl, + .reg_writew = pci_azx_writew, + .reg_readw = pci_azx_readw, + .reg_writeb = pci_azx_writeb, + .reg_readb = pci_azx_readb, .disable_msi_reset_irq = disable_msi_reset_irq, .dma_alloc_pages = dma_alloc_pages, .dma_free_pages = dma_free_pages, |