All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Vinod Koul <vinod.koul@intel.com>, Jeeja KP <jeeja.kp@intel.com>,
	Liam Girdwood <liam.r.girdwood@intel.com>
Subject: [PATCH 16/16] ALSA: hda - Drop azx_sd_read*/write*() macros
Date: Thu, 16 Apr 2015 18:14:30 +0200	[thread overview]
Message-ID: <1429200870-5288-17-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1429200870-5288-1-git-send-email-tiwai@suse.de>

They are no longer used (only one place which can be replaced with a
proper helper function).  Let's drop.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/hda_controller.h | 13 -------------
 sound/pci/hda/hda_intel.c      |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
index e8edb02c12d3..407cba6577b8 100644
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@ -185,19 +185,6 @@ struct azx {
 #define azx_readb(chip, reg) \
 	snd_hdac_chip_readb(azx_bus(chip), reg)
 
-#define azx_sd_writel(chip, dev, reg, value) \
-	snd_hdac_stream_writel(&(dev)->core, reg, value)
-#define azx_sd_readl(chip, dev, reg) \
-	snd_hdac_stream_readl(&(dev)->core, reg)
-#define azx_sd_writew(chip, dev, reg, value) \
-	snd_hdac_stream_writew(&(dev)->core, reg, value)
-#define azx_sd_readw(chip, dev, reg) \
-	snd_hdac_stream_readw(&(dev)->core, reg)
-#define azx_sd_writeb(chip, dev, reg, value) \
-	snd_hdac_stream_writeb(&(dev)->core, reg, value)
-#define azx_sd_readb(chip, dev, reg) \
-	snd_hdac_stream_readb(&(dev)->core, reg)
-
 #define azx_has_pm_runtime(chip) \
 	(!AZX_DCAPS_PM_RUNTIME || ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME))
 
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 8a1471851ca7..2b823d4ad888 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -680,7 +680,7 @@ static unsigned int azx_via_get_position(struct azx *chip,
 	unsigned int mod_link_pos, mod_dma_pos, mod_mini_pos;
 	unsigned int fifo_size;
 
-	link_pos = azx_sd_readl(chip, azx_dev, SD_LPIB);
+	link_pos = snd_hdac_stream_get_pos_lpib(azx_stream(azx_dev));
 	if (azx_dev->core.substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 		/* Playback, no problem using link position */
 		return link_pos;
-- 
2.3.5

      parent reply	other threads:[~2015-04-16 16:14 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-16 16:14 [PATCH 00/16] HD-audio core controller split Takashi Iwai
2015-04-16 16:14 ` [PATCH 01/16] ALSA: hda - Handle error from get_response bus ops directly Takashi Iwai
2015-04-16 16:14 ` [PATCH 02/16] ALSA: hda - Add the controller helper codes to hda-core module Takashi Iwai
2015-04-16 16:14 ` [PATCH 03/16] ALSA: hda - Add DSP loader to core library code Takashi Iwai
2015-04-16 16:14 ` [PATCH 04/16] ALSA: hda - moved alloc/free stream pages function to controller library Takashi Iwai
2015-04-16 16:14 ` [PATCH 05/16] ALSA: hda - Merge codec and controller helpers Takashi Iwai
2015-04-16 16:14 ` [PATCH 06/16] ALSA: hda - Move send_cmd / get_response to hdac_bus_ops Takashi Iwai
2015-04-16 16:14 ` [PATCH 07/16] ALSA: hda - Pass bus io_ops directly from the top-level driver Takashi Iwai
2015-04-16 16:14 ` [PATCH 08/16] ALSA: hda - Migrate hdac_stream into legacy driver Takashi Iwai
2015-04-16 16:14 ` [PATCH 09/16] ALSA: hda - Migrate more hdac_stream codes Takashi Iwai
2015-04-16 16:14 ` [PATCH 10/16] ALSA: hda - Embed bus into controller object Takashi Iwai
2015-04-16 16:14 ` [PATCH 11/16] ALSA: hda - Minor refactoring Takashi Iwai
2015-04-16 16:14 ` [PATCH 12/16] ALSA: hda - Move PCM format and rate handling code to core library Takashi Iwai
2015-04-16 16:14 ` [PATCH 13/16] ALSA: hda - Add missing inclusion of <linux/clocksource.h> Takashi Iwai
2015-04-16 16:14 ` [PATCH 14/16] ALSA: hda - Reenable tracepoints for controller Takashi Iwai
2015-04-16 16:14 ` [PATCH 15/16] ALSA: hda/tegra - Fix build error and warning Takashi Iwai
2015-04-16 16:14 ` Takashi Iwai [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1429200870-5288-17-git-send-email-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=jeeja.kp@intel.com \
    --cc=liam.r.girdwood@intel.com \
    --cc=vinod.koul@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.