Merge branch 'topic/hda' into for-4.2

diff --cc sound/pci/hda/hda_controller.h
index 0efdb09,173bf7c..3c6ebaf
--- 1/sound/pci/hda/hda_controller.h
--- 2/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@@ -378,33 -172,20 +172,20 @@@ struct azx 
   */
  
  #define azx_writel(chip, reg, value) \
-       ((chip)->ops->reg_writel(value, (chip)->remap_addr + AZX_REG_##reg))
+       snd_hdac_chip_writel(azx_bus(chip), reg, value)
  #define azx_readl(chip, reg) \
-       ((chip)->ops->reg_readl((chip)->remap_addr + AZX_REG_##reg))
+       snd_hdac_chip_readl(azx_bus(chip), reg)
  #define azx_writew(chip, reg, value) \
-       ((chip)->ops->reg_writew(value, (chip)->remap_addr + AZX_REG_##reg))
+       snd_hdac_chip_writew(azx_bus(chip), reg, value)
  #define azx_readw(chip, reg) \
-       ((chip)->ops->reg_readw((chip)->remap_addr + AZX_REG_##reg))
+       snd_hdac_chip_readw(azx_bus(chip), reg)
  #define azx_writeb(chip, reg, value) \
-       ((chip)->ops->reg_writeb(value, (chip)->remap_addr + AZX_REG_##reg))
+       snd_hdac_chip_writeb(azx_bus(chip), reg, value)
  #define azx_readb(chip, reg) \
-       ((chip)->ops->reg_readb((chip)->remap_addr + AZX_REG_##reg))
- 
- #define azx_sd_writel(chip, dev, reg, value) \
-       ((chip)->ops->reg_writel(value, (dev)->sd_addr + AZX_REG_##reg))
- #define azx_sd_readl(chip, dev, reg) \
-       ((chip)->ops->reg_readl((dev)->sd_addr + AZX_REG_##reg))
- #define azx_sd_writew(chip, dev, reg, value) \
-       ((chip)->ops->reg_writew(value, (dev)->sd_addr + AZX_REG_##reg))
- #define azx_sd_readw(chip, dev, reg) \
-       ((chip)->ops->reg_readw((dev)->sd_addr + AZX_REG_##reg))
- #define azx_sd_writeb(chip, dev, reg, value) \
-       ((chip)->ops->reg_writeb(value, (dev)->sd_addr + AZX_REG_##reg))
- #define azx_sd_readb(chip, dev, reg) \
-       ((chip)->ops->reg_readb((dev)->sd_addr + AZX_REG_##reg))
+       snd_hdac_chip_readb(azx_bus(chip), reg)
  
  #define azx_has_pm_runtime(chip) \
 -      (!AZX_DCAPS_PM_RUNTIME || ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME))
 +      ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME)
  
  /* PCM setup */
  static inline struct azx_dev *get_azx_dev(struct snd_pcm_substream *substream)

diff --cc sound/pci/hda/hda_intel.c
Simple merge