Commit 2c1f8138 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Avoid tricky macros 



The macros _snd_hdac_chip_read() and *_write() expand to different
types (b,w,l) per their argument.  They were thought to be used only
internally for other snd_hdac_chip_*() macros, but in some situations
we need to call these directly, and they are way too ugly.

Instead of saving a few lines, we just write these macros explicitly
with the types, so that they can be used in a saner way.

Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d1600401

include/sound/hdaudio.h

+18 −10
Original line number Diff line number Diff line
@@ -368,24 +368,32 @@ void snd_hdac_bus_free_stream_pages(struct hdac_bus *bus); 
/*

 * macros for easy use

 */

#define _snd_hdac_chip_write(type, chip, reg, value) \

	((chip)->io_ops->reg_write ## type(value, (chip)->remap_addr + (reg)))

#define _snd_hdac_chip_read(type, chip, reg) \

	((chip)->io_ops->reg_read ## type((chip)->remap_addr + (reg)))

#define _snd_hdac_chip_writeb(chip, reg, value) \

	((chip)->io_ops->reg_writeb(value, (chip)->remap_addr + (reg)))

#define _snd_hdac_chip_readb(chip, reg) \

	((chip)->io_ops->reg_readb((chip)->remap_addr + (reg)))

#define _snd_hdac_chip_writew(chip, reg, value) \

	((chip)->io_ops->reg_writew(value, (chip)->remap_addr + (reg)))

#define _snd_hdac_chip_readw(chip, reg) \

	((chip)->io_ops->reg_readw((chip)->remap_addr + (reg)))

#define _snd_hdac_chip_writel(chip, reg, value) \

	((chip)->io_ops->reg_writel(value, (chip)->remap_addr + (reg)))

#define _snd_hdac_chip_readl(chip, reg) \

	((chip)->io_ops->reg_readl((chip)->remap_addr + (reg)))



/* read/write a register, pass without AZX_REG_ prefix */

#define snd_hdac_chip_writel(chip, reg, value) \

	_snd_hdac_chip_write(l, chip, AZX_REG_ ## reg, value)

	_snd_hdac_chip_writel(chip, AZX_REG_ ## reg, value)

#define snd_hdac_chip_writew(chip, reg, value) \

	_snd_hdac_chip_write(w, chip, AZX_REG_ ## reg, value)

	_snd_hdac_chip_writew(chip, AZX_REG_ ## reg, value)

#define snd_hdac_chip_writeb(chip, reg, value) \

	_snd_hdac_chip_write(b, chip, AZX_REG_ ## reg, value)

	_snd_hdac_chip_writeb(chip, AZX_REG_ ## reg, value)

#define snd_hdac_chip_readl(chip, reg) \

	_snd_hdac_chip_read(l, chip, AZX_REG_ ## reg)

	_snd_hdac_chip_readl(chip, AZX_REG_ ## reg)

#define snd_hdac_chip_readw(chip, reg) \

	_snd_hdac_chip_read(w, chip, AZX_REG_ ## reg)

	_snd_hdac_chip_readw(chip, AZX_REG_ ## reg)

#define snd_hdac_chip_readb(chip, reg) \

	_snd_hdac_chip_read(b, chip, AZX_REG_ ## reg)

	_snd_hdac_chip_readb(chip, AZX_REG_ ## reg)



/* update a register, pass without AZX_REG_ prefix */

#define snd_hdac_chip_updatel(chip, reg, mask, val) \

sound/hda/hdac_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ int snd_hdac_bus_parse_capabilities(struct hdac_bus *bus) 


	/* Lets walk the linked capabilities list */

	do {

		cur_cap = _snd_hdac_chip_read(l, bus, offset);

		cur_cap = _snd_hdac_chip_readl(bus, offset);



		dev_dbg(bus->dev, "Capability version: 0x%x\n",

			(cur_cap & AZX_CAP_HDR_VER_MASK) >> AZX_CAP_HDR_VER_OFF);

sound/hda/hdac_stream.c

+2 −2
Original line number Diff line number Diff line
@@ -555,12 +555,12 @@ void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set, 


	if (!reg)

		reg = AZX_REG_SSYNC;

	val = _snd_hdac_chip_read(l, bus, reg);

	val = _snd_hdac_chip_readl(bus, reg);

	if (set)

		val |= streams;

	else

		val &= ~streams;

	_snd_hdac_chip_write(l, bus, reg, val);

	_snd_hdac_chip_writel(bus, reg, val);

}

EXPORT_SYMBOL_GPL(snd_hdac_stream_sync_trigger);

CRA Git | Maintained and supported by SUSTech CRA and CCSE