Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ALSA: hda/cs35l56: Clean up with PM_RUNTIME_ACQUIRE*() macros
Use PM_RUNTIME_ACQUIRE*() macros for replacing the manual
pm_runtime_resume_and_get() and pm_runtime_put_*() calls.
Merely code cleanups and no functional changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20251216141154.172218-3-tiwai@suse.de
+14
-22
+14
-22
sound/hda/codecs/side-codecs/cs35l56_hda.c
+14
-22
sound/hda/codecs/side-codecs/cs35l56_hda.c
···
588
588
589
589
cs35l56->base.fw_patched = false;
590
590
591
-
ret = pm_runtime_resume_and_get(cs35l56->base.dev);
591
+
PM_RUNTIME_ACQUIRE_IF_ENABLED(cs35l56->base.dev, pm);
592
+
ret = PM_RUNTIME_ACQUIRE_ERR(&pm);
592
593
if (ret < 0) {
593
594
dev_err(cs35l56->base.dev, "Failed to resume and get %d\n", ret);
594
595
return;
···
602
601
*/
603
602
ret = cs35l56_read_prot_status(&cs35l56->base, &firmware_missing, &preloaded_fw_ver);
604
603
if (ret)
605
-
goto err_pm_put;
604
+
return;
606
605
607
606
if (firmware_missing)
608
607
preloaded_fw_ver = 0;
···
691
690
err_fw_release:
692
691
cs35l56_hda_release_firmware_files(wmfw_firmware, wmfw_filename,
693
692
coeff_firmware, coeff_filename);
694
-
err_pm_put:
695
-
pm_runtime_put(cs35l56->base.dev);
696
693
}
697
694
698
695
static void cs35l56_hda_dsp_work(struct work_struct *work)
···
707
708
struct cs35l56_base *cs35l56_base = file->private_data;
708
709
ssize_t ret;
709
710
710
-
ret = pm_runtime_resume_and_get(cs35l56_base->dev);
711
+
PM_RUNTIME_ACQUIRE_IF_ENABLED_AUTOSUSPEND(cs35l56_base->dev, pm);
712
+
ret = PM_RUNTIME_ACQUIRE_ERR(&pm);
711
713
if (ret)
712
714
return ret;
713
715
714
-
ret = cs35l56_calibrate_debugfs_write(cs35l56_base, from, count, ppos);
715
-
pm_runtime_autosuspend(cs35l56_base->dev);
716
-
717
-
return ret;
716
+
return cs35l56_calibrate_debugfs_write(cs35l56_base, from, count, ppos);
718
717
}
719
718
720
719
static ssize_t cs35l56_hda_debugfs_cal_temperature_write(struct file *file,
···
722
725
struct cs35l56_base *cs35l56_base = file->private_data;
723
726
ssize_t ret;
724
727
725
-
ret = pm_runtime_resume_and_get(cs35l56_base->dev);
728
+
PM_RUNTIME_ACQUIRE_IF_ENABLED_AUTOSUSPEND(cs35l56_base->dev, pm);
729
+
ret = PM_RUNTIME_ACQUIRE_ERR(&pm);
726
730
if (ret)
727
731
return ret;
728
732
729
-
ret = cs35l56_cal_ambient_debugfs_write(cs35l56_base, from, count, ppos);
730
-
pm_runtime_autosuspend(cs35l56_base->dev);
731
-
732
-
return ret;
733
+
return cs35l56_cal_ambient_debugfs_write(cs35l56_base, from, count, ppos);
733
734
}
734
735
735
736
static ssize_t cs35l56_hda_debugfs_cal_data_read(struct file *file,
···
737
742
struct cs35l56_base *cs35l56_base = file->private_data;
738
743
ssize_t ret;
739
744
740
-
ret = pm_runtime_resume_and_get(cs35l56_base->dev);
745
+
PM_RUNTIME_ACQUIRE_IF_ENABLED_AUTOSUSPEND(cs35l56_base->dev, pm);
746
+
ret = PM_RUNTIME_ACQUIRE_ERR(&pm);
741
747
if (ret)
742
748
return ret;
743
749
744
-
ret = cs35l56_cal_data_debugfs_read(cs35l56_base, to, count, ppos);
745
-
pm_runtime_autosuspend(cs35l56_base->dev);
746
-
747
-
return ret;
750
+
return cs35l56_cal_data_debugfs_read(cs35l56_base, to, count, ppos);
748
751
}
749
752
750
753
static ssize_t cs35l56_hda_debugfs_cal_data_write(struct file *file,
···
760
767
if (ret < 0)
761
768
return ret;
762
769
763
-
ret = pm_runtime_resume_and_get(cs35l56_base->dev);
770
+
PM_RUNTIME_ACQUIRE_IF_ENABLED_AUTOSUSPEND(cs35l56_base->dev, pm);
771
+
ret = PM_RUNTIME_ACQUIRE_ERR(&pm);
764
772
if (ret)
765
773
return ret;
766
774
···
770
776
cs35l56_mbox_send(cs35l56_base, CS35L56_MBOX_CMD_AUDIO_REINIT);
771
777
else
772
778
count = -EIO;
773
-
774
-
pm_runtime_autosuspend(cs35l56_base->dev);
775
779
776
780
return count;
777
781
}