@@ -482,8 +482,8 @@ static int tokenize_input(const char __user *from, size_t count,
482482 return ret ;
483483}
484484
485- static ssize_t probe_points_read (struct file * file , char __user * to ,
486- size_t count , loff_t * ppos )
485+ static ssize_t sof_probes_dfs_points_read (struct file * file , char __user * to ,
486+ size_t count , loff_t * ppos )
487487{
488488 struct sof_client_dev * cdev = file -> private_data ;
489489 struct sof_probes_priv * priv = cdev -> data ;
@@ -505,7 +505,7 @@ static ssize_t probe_points_read(struct file *file, char __user *to,
505505
506506 ret = pm_runtime_get_sync (dev );
507507 if (ret < 0 && ret != - EACCES ) {
508- dev_err_ratelimited (dev , "error: debugfs read failed to resume %d\n" , ret );
508+ dev_err_ratelimited (dev , "debugfs read failed to resume %d\n" , ret );
509509 pm_runtime_put_noidle (dev );
510510 goto exit ;
511511 }
@@ -517,7 +517,7 @@ static ssize_t probe_points_read(struct file *file, char __user *to,
517517 pm_runtime_mark_last_busy (dev );
518518 err = pm_runtime_put_autosuspend (dev );
519519 if (err < 0 )
520- dev_err_ratelimited (dev , "error: debugfs read failed to idle %d\n" , err );
520+ dev_err_ratelimited (dev , "debugfs read failed to idle %d\n" , err );
521521
522522 for (i = 0 ; i < num_desc ; i ++ ) {
523523 remaining = PAGE_SIZE - strlen (buf );
@@ -540,8 +540,9 @@ static ssize_t probe_points_read(struct file *file, char __user *to,
540540 return ret ;
541541}
542542
543- static ssize_t probe_points_write (struct file * file , const char __user * from ,
544- size_t count , loff_t * ppos )
543+ static ssize_t
544+ sof_probes_dfs_points_write (struct file * file , const char __user * from ,
545+ size_t count , loff_t * ppos )
545546{
546547 struct sof_client_dev * cdev = file -> private_data ;
547548 struct sof_probes_priv * priv = cdev -> data ;
@@ -569,7 +570,7 @@ static ssize_t probe_points_write(struct file *file, const char __user *from,
569570
570571 ret = pm_runtime_get_sync (dev );
571572 if (ret < 0 && ret != - EACCES ) {
572- dev_err_ratelimited (dev , "error: debugfs write failed to resume %d\n" , ret );
573+ dev_err_ratelimited (dev , "debugfs write failed to resume %d\n" , ret );
573574 pm_runtime_put_noidle (dev );
574575 goto exit ;
575576 }
@@ -581,24 +582,24 @@ static ssize_t probe_points_write(struct file *file, const char __user *from,
581582 pm_runtime_mark_last_busy (dev );
582583 err = pm_runtime_put_autosuspend (dev );
583584 if (err < 0 )
584- dev_err_ratelimited (dev , "error: debugfs write failed to idle %d\n" , err );
585+ dev_err_ratelimited (dev , "debugfs write failed to idle %d\n" , err );
585586exit :
586587 kfree (tkns );
587588 return ret ;
588589}
589590
590- static const struct file_operations probe_points_fops = {
591+ static const struct file_operations sof_probes_points_fops = {
591592 .open = simple_open ,
592- .read = probe_points_read ,
593- .write = probe_points_write ,
593+ .read = sof_probes_dfs_points_read ,
594+ .write = sof_probes_dfs_points_write ,
594595 .llseek = default_llseek ,
595596
596597 .owner = THIS_MODULE ,
597598};
598599
599600static ssize_t
600- probe_points_remove_write (struct file * file , const char __user * from ,
601- size_t count , loff_t * ppos )
601+ sof_probes_dfs_points_remove_write (struct file * file , const char __user * from ,
602+ size_t count , loff_t * ppos )
602603{
603604 struct sof_client_dev * cdev = file -> private_data ;
604605 struct sof_probes_priv * priv = cdev -> data ;
@@ -622,7 +623,7 @@ probe_points_remove_write(struct file *file, const char __user *from,
622623
623624 ret = pm_runtime_get_sync (dev );
624625 if (ret < 0 ) {
625- dev_err_ratelimited (dev , "error: debugfs write failed to resume %d\n" , ret );
626+ dev_err_ratelimited (dev , "debugfs write failed to resume %d\n" , ret );
626627 pm_runtime_put_noidle (dev );
627628 goto exit ;
628629 }
@@ -634,15 +635,15 @@ probe_points_remove_write(struct file *file, const char __user *from,
634635 pm_runtime_mark_last_busy (dev );
635636 err = pm_runtime_put_autosuspend (dev );
636637 if (err < 0 )
637- dev_err_ratelimited (dev , "error: debugfs write failed to idle %d\n" , err );
638+ dev_err_ratelimited (dev , "debugfs write failed to idle %d\n" , err );
638639exit :
639640 kfree (tkns );
640641 return ret ;
641642}
642643
643- static const struct file_operations probe_points_remove_fops = {
644+ static const struct file_operations sof_probes_points_remove_fops = {
644645 .open = simple_open ,
645- .write = probe_points_remove_write ,
646+ .write = sof_probes_dfs_points_remove_write ,
646647 .llseek = default_llseek ,
647648
648649 .owner = THIS_MODULE ,
@@ -695,7 +696,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
695696 return - ENXIO ;
696697
697698 if (!dev -> platform_data ) {
698- dev_err (dev , "error: missing platform data\n" );
699+ dev_err (dev , "missing platform data\n" );
699700 return - ENODEV ;
700701 }
701702
@@ -707,7 +708,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
707708
708709 if (!ops -> assign || !ops -> free || !ops -> set_params || !ops -> trigger ||
709710 !ops -> pointer ) {
710- dev_err (dev , "error: missing platform callback(s)\n" );
711+ dev_err (dev , "missing platform callback(s)\n" );
711712 return - ENODEV ;
712713 }
713714
@@ -719,7 +720,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
719720 sof_probes_dai_drv ,
720721 ARRAY_SIZE (sof_probes_dai_drv ));
721722 if (ret < 0 ) {
722- dev_err (dev , "error: failed to register SOF probes DAI driver %d\n" , ret );
723+ dev_err (dev , "failed to register SOF probes DAI driver %d\n" , ret );
723724 return ret ;
724725 }
725726
@@ -728,12 +729,12 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
728729
729730 /* create read-write probes_points debugfs entry */
730731 priv -> dfs_points = debugfs_create_file ("probe_points" , 0644 , dfsroot ,
731- cdev , & probe_points_fops );
732+ cdev , & sof_probes_points_fops );
732733
733734 /* create read-write probe_points_remove debugfs entry */
734735 priv -> dfs_points_remove = debugfs_create_file ("probe_points_remove" , 0644 ,
735736 dfsroot , cdev ,
736- & probe_points_remove_fops );
737+ & sof_probes_points_remove_fops );
737738
738739 links = devm_kcalloc (dev , SOF_PROBES_NUM_DAI_LINKS , sizeof (* links ), GFP_KERNEL );
739740 cpus = devm_kcalloc (dev , SOF_PROBES_NUM_DAI_LINKS , sizeof (* cpus ), GFP_KERNEL );
@@ -772,7 +773,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
772773 if (ret < 0 ) {
773774 debugfs_remove (priv -> dfs_points );
774775 debugfs_remove (priv -> dfs_points_remove );
775- dev_err (dev , "error: Probes card register failed %d\n" , ret );
776+ dev_err (dev , "Probes card register failed %d\n" , ret );
776777 return ret ;
777778 }
778779
0 commit comments