On Wed, Apr 27, 2022 at 02:24:37PM -0400, Adrien Thierry wrote: > Replace the custom debug print macros with the standard dev_err() and > friends. > > This handles TODO item "Cleanup logging mechanism". > > Signed-off-by: Adrien Thierry <athierry@xxxxxxxxxx> > --- > .../interface/vchiq_arm/vchiq_arm.c | 158 +++--- > .../interface/vchiq_arm/vchiq_connected.c | 7 +- > .../interface/vchiq_arm/vchiq_connected.h | 4 +- > .../interface/vchiq_arm/vchiq_core.c | 495 ++++++++---------- > .../interface/vchiq_arm/vchiq_core.h | 43 +- > .../interface/vchiq_arm/vchiq_debugfs.c | 105 ---- > .../interface/vchiq_arm/vchiq_dev.c | 88 ++-- > 7 files changed, 344 insertions(+), 556 deletions(-) > > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > index 0596ac61e286..664940e6d9e9 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > @@ -58,10 +58,6 @@ > #define KEEPALIVE_VER 1 > #define KEEPALIVE_VER_MIN KEEPALIVE_VER > > -/* Run time control of log level, based on KERN_XXX level. */ > -int vchiq_arm_log_level = VCHIQ_LOG_DEFAULT; > -int vchiq_susp_log_level = VCHIQ_LOG_ERROR; > - > DEFINE_SPINLOCK(msg_queue_spinlock); > struct vchiq_state g_state; > > @@ -253,7 +249,7 @@ create_pagelist(char *buf, char __user *ubuf, > pagelist = dma_alloc_coherent(g_dev, pagelist_size, &dma_addr, > GFP_KERNEL); > > - vchiq_log_trace(vchiq_arm_log_level, "%s - %pK", __func__, pagelist); > + dev_dbg(g_dev, "%s - %pK", __func__, pagelist); As dev_dbg() provides the output of the function name, there's no need to keep it in here when you convert to using it. Can you fix this up and resend? thanks, greg k-h
