Skip to content

Commit fa13cef

Browse files
committed
ASoC: SOF: sof-client-probes: Code cleanup for consistency
Rename the debugfs callbacks to be somehow consistent Remove the "error: " prefix from error prints Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 720448c commit fa13cef

1 file changed

Lines changed: 24 additions & 23 deletions

File tree

sound/soc/sof/sof-client-probes.c

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ static int tokenize_input(const char __user *from, size_t count,
479479
return ret;
480480
}
481481

482-
static ssize_t probe_points_read(struct file *file, char __user *to,
483-
size_t count, loff_t *ppos)
482+
static ssize_t sof_probes_dfs_points_read(struct file *file, char __user *to,
483+
size_t count, loff_t *ppos)
484484
{
485485
struct sof_client_dev *cdev = file->private_data;
486486
struct sof_probes_priv *priv = cdev->data;
@@ -502,7 +502,7 @@ static ssize_t probe_points_read(struct file *file, char __user *to,
502502

503503
ret = pm_runtime_get_sync(dev);
504504
if (ret < 0 && ret != -EACCES) {
505-
dev_err_ratelimited(dev, "error: debugfs read failed to resume %d\n", ret);
505+
dev_err_ratelimited(dev, "debugfs read failed to resume %d\n", ret);
506506
pm_runtime_put_noidle(dev);
507507
goto exit;
508508
}
@@ -514,7 +514,7 @@ static ssize_t probe_points_read(struct file *file, char __user *to,
514514
pm_runtime_mark_last_busy(dev);
515515
err = pm_runtime_put_autosuspend(dev);
516516
if (err < 0)
517-
dev_err_ratelimited(dev, "error: debugfs read failed to idle %d\n", err);
517+
dev_err_ratelimited(dev, "debugfs read failed to idle %d\n", err);
518518

519519
for (i = 0; i < num_desc; i++) {
520520
remaining = PAGE_SIZE - strlen(buf);
@@ -537,8 +537,9 @@ static ssize_t probe_points_read(struct file *file, char __user *to,
537537
return ret;
538538
}
539539

540-
static ssize_t probe_points_write(struct file *file, const char __user *from,
541-
size_t count, loff_t *ppos)
540+
static ssize_t
541+
sof_probes_dfs_points_write(struct file *file, const char __user *from,
542+
size_t count, loff_t *ppos)
542543
{
543544
struct sof_client_dev *cdev = file->private_data;
544545
struct sof_probes_priv *priv = cdev->data;
@@ -566,7 +567,7 @@ static ssize_t probe_points_write(struct file *file, const char __user *from,
566567

567568
ret = pm_runtime_get_sync(dev);
568569
if (ret < 0 && ret != -EACCES) {
569-
dev_err_ratelimited(dev, "error: debugfs write failed to resume %d\n", ret);
570+
dev_err_ratelimited(dev, "debugfs write failed to resume %d\n", ret);
570571
pm_runtime_put_noidle(dev);
571572
goto exit;
572573
}
@@ -578,24 +579,24 @@ static ssize_t probe_points_write(struct file *file, const char __user *from,
578579
pm_runtime_mark_last_busy(dev);
579580
err = pm_runtime_put_autosuspend(dev);
580581
if (err < 0)
581-
dev_err_ratelimited(dev, "error: debugfs write failed to idle %d\n", err);
582+
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);
582583
exit:
583584
kfree(tkns);
584585
return ret;
585586
}
586587

587-
static const struct file_operations probe_points_fops = {
588+
static const struct file_operations sof_probes_points_fops = {
588589
.open = simple_open,
589-
.read = probe_points_read,
590-
.write = probe_points_write,
590+
.read = sof_probes_dfs_points_read,
591+
.write = sof_probes_dfs_points_write,
591592
.llseek = default_llseek,
592593

593594
.owner = THIS_MODULE,
594595
};
595596

596597
static ssize_t
597-
probe_points_remove_write(struct file *file, const char __user *from,
598-
size_t count, loff_t *ppos)
598+
sof_probes_dfs_points_remove_write(struct file *file, const char __user *from,
599+
size_t count, loff_t *ppos)
599600
{
600601
struct sof_client_dev *cdev = file->private_data;
601602
struct sof_probes_priv *priv = cdev->data;
@@ -619,7 +620,7 @@ probe_points_remove_write(struct file *file, const char __user *from,
619620

620621
ret = pm_runtime_get_sync(dev);
621622
if (ret < 0) {
622-
dev_err_ratelimited(dev, "error: debugfs write failed to resume %d\n", ret);
623+
dev_err_ratelimited(dev, "debugfs write failed to resume %d\n", ret);
623624
pm_runtime_put_noidle(dev);
624625
goto exit;
625626
}
@@ -631,15 +632,15 @@ probe_points_remove_write(struct file *file, const char __user *from,
631632
pm_runtime_mark_last_busy(dev);
632633
err = pm_runtime_put_autosuspend(dev);
633634
if (err < 0)
634-
dev_err_ratelimited(dev, "error: debugfs write failed to idle %d\n", err);
635+
dev_err_ratelimited(dev, "debugfs write failed to idle %d\n", err);
635636
exit:
636637
kfree(tkns);
637638
return ret;
638639
}
639640

640-
static const struct file_operations probe_points_remove_fops = {
641+
static const struct file_operations sof_probes_points_remove_fops = {
641642
.open = simple_open,
642-
.write = probe_points_remove_write,
643+
.write = sof_probes_dfs_points_remove_write,
643644
.llseek = default_llseek,
644645

645646
.owner = THIS_MODULE,
@@ -692,7 +693,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
692693
return 0;
693694

694695
if (!dev->platform_data) {
695-
dev_err(dev, "error: missing platform data\n");
696+
dev_err(dev, "missing platform data\n");
696697
return -ENODEV;
697698
}
698699

@@ -704,7 +705,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
704705

705706
if (!ops->assign || !ops->free || !ops->set_params || !ops->trigger ||
706707
!ops->pointer) {
707-
dev_err(dev, "error: missing platform callback(s)\n");
708+
dev_err(dev, "missing platform callback(s)\n");
708709
return -ENODEV;
709710
}
710711

@@ -716,7 +717,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
716717
sof_probes_dai_drv,
717718
ARRAY_SIZE(sof_probes_dai_drv));
718719
if (ret < 0) {
719-
dev_err(dev, "error: failed to register SOF probes DAI driver %d\n", ret);
720+
dev_err(dev, "failed to register SOF probes DAI driver %d\n", ret);
720721
return ret;
721722
}
722723

@@ -725,12 +726,12 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
725726

726727
/* create read-write probes_points debugfs entry */
727728
priv->dfs_points = debugfs_create_file("probe_points", 0644, dfsroot,
728-
cdev, &probe_points_fops);
729+
cdev, &sof_probes_points_fops);
729730

730731
/* create read-write probe_points_remove debugfs entry */
731732
priv->dfs_points_remove = debugfs_create_file("probe_points_remove", 0644,
732733
dfsroot, cdev,
733-
&probe_points_remove_fops);
734+
&sof_probes_points_remove_fops);
734735

735736
links = devm_kcalloc(dev, SOF_PROBES_NUM_DAI_LINKS, sizeof(*links), GFP_KERNEL);
736737
cpus = devm_kcalloc(dev, SOF_PROBES_NUM_DAI_LINKS, sizeof(*cpus), GFP_KERNEL);
@@ -769,7 +770,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
769770
if (ret < 0) {
770771
debugfs_remove(priv->dfs_points);
771772
debugfs_remove(priv->dfs_points_remove);
772-
dev_err(dev, "error: Probes card register failed %d\n", ret);
773+
dev_err(dev, "Probes card register failed %d\n", ret);
773774
return ret;
774775
}
775776

0 commit comments

Comments
 (0)