Re: [PATCH v4 6/8] staging: bcm2835-audio: Add function name to debug and error logs

[Aishwarya Pant <aishpant@gmail.com>]

On Wed, Mar 08, 2017 at 08:19:51PM +0530, Aishwarya Pant wrote:
> This patch adds current function names __func__ to debug and error logs
> in the work functions.
> 
> Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
> ---
>  .../staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c   | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> index 026582e..77657a0 100644
> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> @@ -138,7 +138,7 @@ int bcm2835_audio_start(struct bcm2835_alsa_stream *alsa_stream)
>  		work = kmalloc(sizeof(*work), GFP_ATOMIC);
>  		/*--- Queue some work (item 1) ---*/
>  		if (!work) {
> -			LOG_ERR(" .. Error: NULL work kmalloc\n");
> +			LOG_ERR("%s: Error: NULL work kmalloc\n", __func__);
>  			return -ENOMEM;
>  		}
>  		INIT_WORK(&work->my_work, my_wq_function);
> @@ -146,10 +146,11 @@ int bcm2835_audio_start(struct bcm2835_alsa_stream *alsa_stream)
>  		work->cmd = BCM2835_AUDIO_START;
>  		if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
>  			kfree(work);
> +			LOG_ERR("%s: Error: Unable to start audio\n", __func__);
>  			return -EBUSY;
>  		}
>  	}
> -	LOG_DBG(" .. OUT\n");
> +	LOG_DBG("%s: .. OUT\n", __func__);
>  	return 0;
>  }
>  
> @@ -162,7 +163,7 @@ int bcm2835_audio_stop(struct bcm2835_alsa_stream *alsa_stream)
>  		work = kmalloc(sizeof(*work), GFP_ATOMIC);
>  		/*--- Queue some work (item 1) ---*/
>  		if (!work) {
> -			LOG_ERR(" .. Error: NULL work kmalloc\n");
> +			LOG_ERR("%s: Error: NULL work kmalloc\n", __func__);
>  			return -ENOMEM;
>  		}
>  		INIT_WORK(&work->my_work, my_wq_function);
> @@ -170,10 +171,11 @@ int bcm2835_audio_stop(struct bcm2835_alsa_stream *alsa_stream)
>  		work->cmd = BCM2835_AUDIO_STOP;
>  		if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
>  			kfree(work);
> +			LOG_ERR("%s: Error: Unable to stop audio\n", __func__);
>  			return -EBUSY;
>  		}
>  	}
> -	LOG_DBG(" .. OUT\n");
> +	LOG_DBG("%s: .. OUT\n", __func__);
>  	return 0;
>  }
>  
> @@ -187,7 +189,7 @@ int bcm2835_audio_write(struct bcm2835_alsa_stream *alsa_stream,
>  		work = kmalloc(sizeof(*work), GFP_ATOMIC);
>  		/*--- Queue some work (item 1) ---*/
>  		if (!work) {
> -			LOG_ERR(" .. Error: NULL work kmalloc\n");
> +			LOG_ERR("%s: Error: NULL work kmalloc\n", __func__);
>  			return -ENOMEM;
>  		}
>  		INIT_WORK(&work->my_work, my_wq_function);
> @@ -197,10 +199,11 @@ int bcm2835_audio_write(struct bcm2835_alsa_stream *alsa_stream,
>  		work->count = count;
>  		if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
>  			kfree(work);
> +			LOG_ERR("%s: Error: Unable to write\n", __func__);
>  			return -EBUSY;
>  		}
>  	}
> -	LOG_DBG(" .. OUT\n");
> +	LOG_DBG("%s: .. OUT\n", __func__);


Please ignore this patch.
LOG_DBG/ERR/INFO(..) are wrappers around pr_*(..) family with line 
number and function name appended. I'll send a new patchset with 
these changes reverted.



>  	return 0;
>  }
>  
> -- 
> 2.7.4
>