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

Commit 2a433b9d authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

ASoC: twl6040: Do not use wrapper for irq request 



The twl6040_request_irq/free_irq inline functions are going
to be removed, so replace them with direct calls.
The irq number is provided by the core driver via resource.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 625cbe46

sound/soc/codecs/twl6040.c

+14 −5
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ struct twl6040_jack_data { 




/* codec private data */

/* codec private data */

struct twl6040_data {

struct twl6040_data {

	int plug_irq;

	int codec_powered;

	int codec_powered;

	int pll;

	int pll;

	int non_lp;

	int non_lp;
@@ -1527,6 +1528,8 @@ static int twl6040_probe(struct snd_soc_codec *codec) 
{

{

	struct twl6040_data *priv;

	struct twl6040_data *priv;

	struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);

	struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);

	struct platform_device *pdev = container_of(codec->dev,

						   struct platform_device, dev);

	int ret = 0;

	int ret = 0;





	priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);

	priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
@@ -1553,6 +1556,13 @@ static int twl6040_probe(struct snd_soc_codec *codec) 
		priv->hf_right_step = 1;

		priv->hf_right_step = 1;

	}

	}





	priv->plug_irq = platform_get_irq(pdev, 0);

	if (priv->plug_irq < 0) {

		dev_err(codec->dev, "invalid irq\n");

		ret = -EINVAL;

		goto work_err;

	}



	priv->sysclk_constraints = &hp_constraints;

	priv->sysclk_constraints = &hp_constraints;

	priv->workqueue = create_singlethread_workqueue("twl6040-codec");

	priv->workqueue = create_singlethread_workqueue("twl6040-codec");

	if (!priv->workqueue) {

	if (!priv->workqueue) {
@@ -1581,9 +1591,8 @@ static int twl6040_probe(struct snd_soc_codec *codec) 
	INIT_DELAYED_WORK(&priv->hs_delayed_work, twl6040_pga_hs_work);

	INIT_DELAYED_WORK(&priv->hs_delayed_work, twl6040_pga_hs_work);

	INIT_DELAYED_WORK(&priv->hf_delayed_work, twl6040_pga_hf_work);

	INIT_DELAYED_WORK(&priv->hf_delayed_work, twl6040_pga_hf_work);





	ret = twl6040_request_irq(codec->control_data, TWL6040_IRQ_PLUG,

	ret = request_threaded_irq(priv->plug_irq, NULL, twl6040_audio_handler,

				  twl6040_audio_handler, 0,

				   0, "twl6040_irq_plug", codec);

				  "twl6040_irq_plug", codec);

	if (ret) {

	if (ret) {

		dev_err(codec->dev, "PLUG IRQ request failed: %d\n", ret);

		dev_err(codec->dev, "PLUG IRQ request failed: %d\n", ret);

		goto plugirq_err;

		goto plugirq_err;
@@ -1604,7 +1613,7 @@ static int twl6040_probe(struct snd_soc_codec *codec) 
	return 0;

	return 0;





bias_err:

bias_err:

	twl6040_free_irq(codec->control_data, TWL6040_IRQ_PLUG, codec);

	free_irq(priv->plug_irq, codec);

plugirq_err:

plugirq_err:

	destroy_workqueue(priv->hs_workqueue);

	destroy_workqueue(priv->hs_workqueue);

hswq_err:

hswq_err:
@@ -1621,7 +1630,7 @@ static int twl6040_remove(struct snd_soc_codec *codec) 
	struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);

	struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);





	twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);

	twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);

	twl6040_free_irq(codec->control_data, TWL6040_IRQ_PLUG, codec);

	free_irq(priv->plug_irq, codec);

	destroy_workqueue(priv->workqueue);

	destroy_workqueue(priv->workqueue);

	destroy_workqueue(priv->hf_workqueue);

	destroy_workqueue(priv->hf_workqueue);

	destroy_workqueue(priv->hs_workqueue);

	destroy_workqueue(priv->hs_workqueue);