Unverified Commit ff0035e4 authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Mark Brown
Browse files

ASoC: mediatek: mt8183-da7219: apply some refactors 



1. Moves headset jack to card-specific storage.
2. Removes trailing blank line.
3. Moves card registration to the end of probe.

Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20200213112003.4.Ia542007f51d3de753a9e0a83135ee074581dbf71@changeid


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 195a6431

sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c

+6 −13
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#include "../../codecs/da7219-aad.h"

#include "../../codecs/da7219.h"



static struct snd_soc_jack headset_jack;



enum PINCTRL_PIN_STATE {

	PIN_STATE_DEFAULT = 0,

	PIN_TDM_OUT_ON,
@@ -32,6 +30,7 @@ static const char * const mt8183_pin_str[PIN_STATE_MAX] = { 
struct mt8183_da7219_max98357_priv {

	struct pinctrl *pinctrl;

	struct pinctrl_state *pin_states[PIN_STATE_MAX];

	struct snd_soc_jack headset_jack;

};



static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream,
@@ -510,6 +509,8 @@ static int 
mt8183_da7219_max98357_headset_init(struct snd_soc_component *component)

{

	int ret;

	struct mt8183_da7219_max98357_priv *priv =

			snd_soc_card_get_drvdata(component->card);



	/* Enable Headset and 4 Buttons Jack detection */

	ret = snd_soc_card_jack_new(&mt8183_da7219_max98357_card,
@@ -517,12 +518,12 @@ mt8183_da7219_max98357_headset_init(struct snd_soc_component *component) 
				    SND_JACK_HEADSET |

				    SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				    SND_JACK_BTN_2 | SND_JACK_BTN_3,

				    &headset_jack,

				    &priv->headset_jack,

				    NULL, 0);

	if (ret)

		return ret;



	da7219_aad_jack_det(component, &headset_jack);

	da7219_aad_jack_det(component, &priv->headset_jack);



	return ret;

}
@@ -559,13 +560,6 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret) {

		dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",

			__func__, ret);

		return ret;

	}



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;
@@ -607,7 +601,7 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) 
				 __func__, ret);

	}



	return ret;

	return devm_snd_soc_register_card(&pdev->dev, card);

}



#ifdef CONFIG_OF
@@ -634,4 +628,3 @@ MODULE_DESCRIPTION("MT8183-DA7219-MAX98357 ALSA SoC machine driver"); 
MODULE_AUTHOR("Shunli Wang <shunli.wang@mediatek.com>");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("mt8183_da7219_max98357 soc card");

CRA Git | Maintained and supported by SUSTech CRA and CCSE