Commit 8c11827b authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Takashi Iwai
Browse files

ALSA: hda: Use hdac_to_hda_codec macro 



Use hdac_to_hda_codec() instead of container_of().

No functional change intended.

Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20200505030357.28004-2-kai.heng.feng@canonical.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 50f0bf55

include/sound/hda_codec.h

+4 −0
Original line number Diff line number Diff line
@@ -288,6 +288,10 @@ struct hda_codec { 
#define dev_to_hda_codec(_dev)	container_of(_dev, struct hda_codec, core.dev)

#define hda_codec_dev(_dev)	(&(_dev)->core.dev)



#define hdac_to_hda_priv(_hdac) \

			container_of(_hdac, struct hdac_hda_priv, codec.core)

#define hdac_to_hda_codec(_hdac) container_of(_hdac, struct hda_codec, core)



#define list_for_each_codec(c, bus) \

	list_for_each_entry(c, &(bus)->core.codec_list, core.list)

#define list_for_each_codec_safe(c, n, bus)				\

sound/pci/hda/patch_hdmi.c

+6 −6
Original line number Diff line number Diff line
@@ -2022,7 +2022,7 @@ static const struct hda_pcm_ops generic_ops = { 


static int hdmi_get_spk_alloc(struct hdac_device *hdac, int pcm_idx)

{

	struct hda_codec *codec = container_of(hdac, struct hda_codec, core);

	struct hda_codec *codec = hdac_to_hda_codec(hdac);

	struct hdmi_spec *spec = codec->spec;

	struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);
@@ -2035,7 +2035,7 @@ static int hdmi_get_spk_alloc(struct hdac_device *hdac, int pcm_idx) 
static void hdmi_get_chmap(struct hdac_device *hdac, int pcm_idx,

					unsigned char *chmap)

{

	struct hda_codec *codec = container_of(hdac, struct hda_codec, core);

	struct hda_codec *codec = hdac_to_hda_codec(hdac);

	struct hdmi_spec *spec = codec->spec;

	struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);
@@ -2049,7 +2049,7 @@ static void hdmi_get_chmap(struct hdac_device *hdac, int pcm_idx, 
static void hdmi_set_chmap(struct hdac_device *hdac, int pcm_idx,

				unsigned char *chmap, int prepared)

{

	struct hda_codec *codec = container_of(hdac, struct hda_codec, core);

	struct hda_codec *codec = hdac_to_hda_codec(hdac);

	struct hdmi_spec *spec = codec->spec;

	struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);
@@ -2065,7 +2065,7 @@ static void hdmi_set_chmap(struct hdac_device *hdac, int pcm_idx, 


static bool is_hdmi_pcm_attached(struct hdac_device *hdac, int pcm_idx)

{

	struct hda_codec *codec = container_of(hdac, struct hda_codec, core);

	struct hda_codec *codec = hdac_to_hda_codec(hdac);

	struct hdmi_spec *spec = codec->spec;

	struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx);
@@ -3783,7 +3783,7 @@ static int atihdmi_paired_chmap_validate(struct hdac_chmap *chmap, 
static int atihdmi_pin_set_slot_channel(struct hdac_device *hdac,

		hda_nid_t pin_nid, int hdmi_slot, int stream_channel)

{

	struct hda_codec *codec = container_of(hdac, struct hda_codec, core);

	struct hda_codec *codec = hdac_to_hda_codec(hdac);

	int verb;

	int ati_channel_setup = 0;
@@ -3819,7 +3819,7 @@ static int atihdmi_pin_set_slot_channel(struct hdac_device *hdac, 
static int atihdmi_pin_get_slot_channel(struct hdac_device *hdac,

				hda_nid_t pin_nid, int asp_slot)

{

	struct hda_codec *codec = container_of(hdac, struct hda_codec, core);

	struct hda_codec *codec = hdac_to_hda_codec(hdac);

	bool was_odd = false;

	int ati_asp_slot = asp_slot;

	int verb;

sound/soc/codecs/hdac_hda.h

+0 −4
Original line number Diff line number Diff line
@@ -28,10 +28,6 @@ struct hdac_hda_priv { 
	bool need_display_power;

};



#define hdac_to_hda_priv(_hdac) \

			container_of(_hdac, struct hdac_hda_priv, codec.core)

#define hdac_to_hda_codec(_hdac) container_of(_hdac, struct hda_codec, core)



struct hdac_ext_bus_ops *snd_soc_hdac_hda_get_ops(void);



#endif /* __HDAC_HDA_H__ */