staging: vchiq_core: Do not log debug in a separate scope

Do not log a dev_dbg() with a separate scope. Drop the {..}
scope and align the dev_dbg() to make it more readable.

No functional changes intended in this patch.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/20241013112128.397249-3-umang.jain@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index e9b60dd8d41921a18210914dc56cd8cfe82f9abd..0324dfe59dcae45048906cdf86de518237c11a59 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -936,6 +936,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
        struct vchiq_service_quota *quota = NULL;
        struct vchiq_header *header;
        int type = VCHIQ_MSG_TYPE(msgid);
+       int svc_fourcc;
 
        size_t stride;
 
@@ -1128,17 +1129,13 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
        header->msgid = msgid;
        header->size = size;
 
-       {
-               int svc_fourcc;
-
-               svc_fourcc = service
-                       ? service->base.fourcc
-                       : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
+       svc_fourcc = service ? service->base.fourcc
+                            : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
 
-               dev_dbg(state->dev, "core_msg: Sent Msg %s(%u) to %p4cc s:%u d:%d len:%zu\n",
-                       msg_type_str(VCHIQ_MSG_TYPE(msgid)), VCHIQ_MSG_TYPE(msgid),
-                       &svc_fourcc, VCHIQ_MSG_SRCPORT(msgid), VCHIQ_MSG_DSTPORT(msgid), size);
-       }
+       dev_dbg(state->dev, "core_msg: Sent Msg %s(%u) to %p4cc s:%u d:%d len:%zu\n",
+               msg_type_str(VCHIQ_MSG_TYPE(msgid)),
+               VCHIQ_MSG_TYPE(msgid), &svc_fourcc,
+               VCHIQ_MSG_SRCPORT(msgid), VCHIQ_MSG_DSTPORT(msgid), size);
 
        /* Make sure the new header is visible to the peer. */
        wmb();