Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28aedaf7 authored by Norberto Lopes's avatar Norberto Lopes Committed by Takashi Iwai
Browse files

ALSA: sound/pci/hda/hda_codec.c: various coding style fixes 



Signed-off-by: default avatarNorberto Lopes <nlopes.ml@gmail.com>
Acked-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 20645d70

sound/pci/hda/hda_codec.c

+38 −31
Original line number Diff line number Diff line
@@ -978,7 +978,8 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, 
 *

 * Returns 0 if successful, or a negative error code.

 */

int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,

int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus,

				unsigned int codec_addr,

				struct hda_codec **codecp)

{

	struct hda_codec *codec;
@@ -1356,7 +1357,8 @@ u32 snd_hda_pin_sense(struct hda_codec *codec, hda_nid_t nid) 
	if (!codec->no_trigger_sense) {

		pincap = snd_hda_query_pin_caps(codec, nid);

		if (pincap & AC_PINCAP_TRIG_REQ) /* need trigger? */

			snd_hda_codec_read(codec, nid, 0, AC_VERB_SET_PIN_SENSE, 0);

			snd_hda_codec_read(codec, nid, 0,

					AC_VERB_SET_PIN_SENSE, 0);

	}

	return snd_hda_codec_read(codec, nid, 0,

				  AC_VERB_GET_PIN_SENSE, 0);
@@ -2979,8 +2981,12 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, 
	val |= channels - 1;



	switch (snd_pcm_format_width(format)) {

	case 8:  val |= 0x00; break;

	case 16: val |= 0x10; break;

	case 8:

		val |= 0x00;

		break;

	case 16:

		val |= 0x10;

		break;

	case 20:

	case 24:

	case 32:
@@ -3298,7 +3304,8 @@ static int get_empty_pcm_device(struct hda_bus *bus, int type) 
		if (!test_and_set_bit(audio_idx[type][i], bus->pcm_dev_bits))

			return audio_idx[type][i];



	snd_printk(KERN_WARNING "Too many %s devices\n", snd_hda_pcm_type_name[type]);

	snd_printk(KERN_WARNING "Too many %s devices\n",

		snd_hda_pcm_type_name[type]);

	return -EAGAIN;

}