Skip to content

Commit bbe5e3c

Browse files
Sakari Ailusbroonie
authored andcommitted
ASoC: codecs: Remove redundant pm_runtime_mark_last_busy() calls
pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(), pm_runtime_autosuspend() and pm_request_autosuspend() now include a call to pm_runtime_mark_last_busy(). Remove the now-reduntant explicit call to pm_runtime_mark_last_busy(). Signed-off-by: Sakari Ailus <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 9069141 commit bbe5e3c

33 files changed

+0
-51
lines changed

sound/soc/codecs/arizona-jack.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ static void arizona_stop_mic(struct arizona_priv *info)
319319

320320
if (change) {
321321
regulator_disable(info->micvdd);
322-
pm_runtime_mark_last_busy(arizona->dev);
323322
pm_runtime_put_autosuspend(arizona->dev);
324323
}
325324
}
@@ -1127,7 +1126,6 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
11271126

11281127
mutex_unlock(&info->lock);
11291128

1130-
pm_runtime_mark_last_busy(arizona->dev);
11311129
pm_runtime_put_autosuspend(arizona->dev);
11321130

11331131
return IRQ_HANDLED;

sound/soc/codecs/cs35l41.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ static irqreturn_t cs35l41_irq(int irq, void *data)
483483
}
484484

485485
done:
486-
pm_runtime_mark_last_busy(cs35l41->dev);
487486
pm_runtime_put_autosuspend(cs35l41->dev);
488487

489488
return ret;
@@ -1328,7 +1327,6 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg *
13281327

13291328
pm_runtime_set_autosuspend_delay(cs35l41->dev, 3000);
13301329
pm_runtime_use_autosuspend(cs35l41->dev);
1331-
pm_runtime_mark_last_busy(cs35l41->dev);
13321330
pm_runtime_set_active(cs35l41->dev);
13331331
pm_runtime_get_noresume(cs35l41->dev);
13341332
pm_runtime_enable(cs35l41->dev);

sound/soc/codecs/cs35l45.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,6 @@ int cs35l45_probe(struct cs35l45_private *cs35l45)
14271427

14281428
pm_runtime_set_autosuspend_delay(cs35l45->dev, 3000);
14291429
pm_runtime_use_autosuspend(cs35l45->dev);
1430-
pm_runtime_mark_last_busy(cs35l45->dev);
14311430
pm_runtime_set_active(cs35l45->dev);
14321431
pm_runtime_get_noresume(cs35l45->dev);
14331432
pm_runtime_enable(cs35l45->dev);

sound/soc/codecs/cs35l56-sdw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ static void cs35l56_sdw_init(struct sdw_slave *peripheral)
282282
}
283283

284284
out:
285-
pm_runtime_mark_last_busy(cs35l56->base.dev);
286285
pm_runtime_put_autosuspend(cs35l56->base.dev);
287286
}
288287

sound/soc/codecs/cs35l56.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,6 @@ static void cs35l56_dsp_work(struct work_struct *work)
849849

850850
cs35l56_log_tuning(&cs35l56->base, &cs35l56->dsp.cs_dsp);
851851
err:
852-
pm_runtime_mark_last_busy(cs35l56->base.dev);
853852
pm_runtime_put_autosuspend(cs35l56->base.dev);
854853
}
855854

sound/soc/codecs/cs42l42.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1775,7 +1775,6 @@ irqreturn_t cs42l42_irq_thread(int irq, void *data)
17751775
}
17761776

17771777
mutex_unlock(&cs42l42->irq_lock);
1778-
pm_runtime_mark_last_busy(cs42l42->dev);
17791778
pm_runtime_put_autosuspend(cs42l42->dev);
17801779

17811780
return IRQ_HANDLED;

sound/soc/codecs/cs42l43-jack.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ int cs42l43_set_jack(struct snd_soc_component *component,
242242
error:
243243
mutex_unlock(&priv->jack_lock);
244244

245-
pm_runtime_mark_last_busy(priv->dev);
246245
pm_runtime_put_autosuspend(priv->dev);
247246

248247
return ret;
@@ -423,7 +422,6 @@ void cs42l43_button_press_work(struct work_struct *work)
423422
error:
424423
mutex_unlock(&priv->jack_lock);
425424

426-
pm_runtime_mark_last_busy(priv->dev);
427425
pm_runtime_put_autosuspend(priv->dev);
428426
}
429427

@@ -462,7 +460,6 @@ void cs42l43_button_release_work(struct work_struct *work)
462460

463461
mutex_unlock(&priv->jack_lock);
464462

465-
pm_runtime_mark_last_busy(priv->dev);
466463
pm_runtime_put_autosuspend(priv->dev);
467464
}
468465

@@ -504,7 +501,6 @@ void cs42l43_bias_sense_timeout(struct work_struct *work)
504501

505502
mutex_unlock(&priv->jack_lock);
506503

507-
pm_runtime_mark_last_busy(priv->dev);
508504
pm_runtime_put_autosuspend(priv->dev);
509505
}
510506

@@ -776,7 +772,6 @@ void cs42l43_tip_sense_work(struct work_struct *work)
776772

777773
priv->suspend_jack_debounce = false;
778774

779-
pm_runtime_mark_last_busy(priv->dev);
780775
pm_runtime_put_autosuspend(priv->dev);
781776
}
782777

sound/soc/codecs/cs42l43.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,6 @@ static int cs42l43_shutter_get(struct cs42l43_codec *priv, unsigned int shift)
10881088
ret ? "open" : "closed");
10891089

10901090
error:
1091-
pm_runtime_mark_last_busy(priv->dev);
10921091
pm_runtime_put_autosuspend(priv->dev);
10931092

10941093
return ret;
@@ -2370,7 +2369,6 @@ static int cs42l43_codec_probe(struct platform_device *pdev)
23702369
goto err_clk;
23712370
}
23722371

2373-
pm_runtime_mark_last_busy(priv->dev);
23742372
pm_runtime_put_autosuspend(priv->dev);
23752373

23762374
return 0;

sound/soc/codecs/cs48l32.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,6 @@ static irqreturn_t cs48l32_irq(int irq, void *data)
13851385
result = IRQ_HANDLED;
13861386

13871387
out:
1388-
pm_runtime_mark_last_busy(cs48l32_codec->core.dev);
13891388
pm_runtime_put_autosuspend(cs48l32_codec->core.dev);
13901389

13911390
return result;

sound/soc/codecs/hda.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ int hda_codec_probe_complete(struct hda_codec *codec)
162162
snd_hda_codec_register(codec);
163163

164164
/* Complement pm_runtime_get_sync(bus) in probe */
165-
pm_runtime_mark_last_busy(bus->dev);
166165
pm_runtime_put_autosuspend(bus->dev);
167166

168167
return ret;
@@ -262,7 +261,6 @@ static int hda_codec_probe(struct snd_soc_component *component)
262261

263262
snd_hdac_ext_bus_link_put(bus, hlink);
264263

265-
pm_runtime_mark_last_busy(bus->dev);
266264
pm_runtime_put_autosuspend(bus->dev);
267265
return ret;
268266
}
@@ -300,7 +298,6 @@ static void hda_codec_remove(struct snd_soc_component *component)
300298
* not be called due to early error, leaving bus uc unbalanced
301299
*/
302300
if (!was_registered) {
303-
pm_runtime_mark_last_busy(bus->dev);
304301
pm_runtime_put_autosuspend(bus->dev);
305302
}
306303

0 commit comments

Comments
 (0)