staging: vc04_services: fix quoted string split across lines

Fix checkpatch warning "fix quoted string split across lines".

Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
Link: https://lore.kernel.org/r/20201027175117.32826-3-amarjargal16@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 5862d63cba8d3fffdfd5490f808abff18a03eb62..f500a704380565e118cfd6717694e106a06fa2eb 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -610,8 +610,7 @@ service_callback(enum vchiq_reason reason, struct vchiq_header *header,
                return VCHIQ_SUCCESS;
 
        vchiq_log_trace(vchiq_arm_log_level,
-               "%s - service %lx(%d,%p), reason %d, header %lx, "
-               "instance %lx, bulk_userdata %lx",
+               "%s - service %lx(%d,%p), reason %d, header %lx, instance %lx, bulk_userdata %lx",
                __func__, (unsigned long)user_service,
                service->localport, user_service->userdata,
                reason, (unsigned long)header,
@@ -1300,8 +1299,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                rc = mutex_lock_killable(&instance->state->mutex);
                if (rc) {
                        vchiq_log_error(vchiq_arm_log_level,
-                               "vchiq: connect: could not lock mutex for "
-                               "state %d: %d",
+                               "vchiq: connect: could not lock mutex for state %d: %d",
                                instance->state->id, rc);
                        ret = -EINTR;
                        break;
@@ -1384,8 +1382,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                vchiq_release_service_internal(service);
                        if (status != VCHIQ_SUCCESS) {
                                vchiq_log_error(vchiq_susp_log_level,
-                                       "%s: cmd %s returned error %d for "
-                                       "service %c%c%c%c:%03d",
+                                       "%s: cmd %s returned error %d for service %c%c%c%c:%03d",
                                        __func__,
                                        (cmd == VCHIQ_IOC_USE_SERVICE) ?
                                                "VCHIQ_IOC_USE_SERVICE" :
@@ -2347,8 +2344,7 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
                        service->client_id);
                entity_uc = &service->service_use_count;
        } else {
-               vchiq_log_error(vchiq_susp_log_level, "%s null service "
-                               "ptr", __func__);
+               vchiq_log_error(vchiq_susp_log_level, "%s null service ptr", __func__);
                ret = VCHIQ_ERROR;
                goto out;
        }
@@ -2643,8 +2639,7 @@ vchiq_check_service(struct vchiq_service *service)
 
        if (ret == VCHIQ_ERROR) {
                vchiq_log_error(vchiq_susp_log_level,
-                       "%s ERROR - %c%c%c%c:%d service count %d, "
-                       "state count %d", __func__,
+                       "%s ERROR - %c%c%c%c:%d service count %d, state count %d", __func__,
                        VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
                        service->client_id, service->service_use_count,
                        arm_state->videocore_use_count);

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
index 79b75efa6868b66dc87c5b3bf458448f19fc9d6a..f91e21a0b51bbad206476f736129de7b79a808d9 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
@@ -43,8 +43,7 @@ void vchiq_add_connected_callback(VCHIQ_CONNECTED_CALLBACK_T callback)
        else {
                if (g_num_deferred_callbacks >= MAX_CALLBACKS)
                        vchiq_log_error(vchiq_core_log_level,
-                               "There already %d callback registered - "
-                               "please increase MAX_CALLBACKS",
+                               "There already %d callback registered - please increase MAX_CALLBACKS",
                                g_num_deferred_callbacks);
                else {
                        g_deferred_callback[g_num_deferred_callbacks] =

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 15c90f81e31bf97c730e57c4ca71e5bba7272f36..0b0a97bfd01cdb8646e187a86a4dfaf0e8c86cae 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -900,8 +900,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
                                service_quota->slot_quota))) {
                        spin_unlock(&quota_spinlock);
                        vchiq_log_trace(vchiq_core_log_level,
-                               "%d: qm:%d %s,%zx - quota stall "
-                               "(msg %d, slot %d)",
+                               "%d: qm:%d %s,%zx - quota stall (msg %d, slot %d)",
                                state->id, service->localport,
                                msg_type_str(type), size,
                                service_quota->message_use_count,
@@ -1412,8 +1411,7 @@ abort_outstanding_bulks(struct vchiq_service *service,
                        vchiq_complete_bulk(bulk);
 
                        vchiq_log_info(SRVTRACE_LEVEL(service),
-                               "%s %c%c%c%c d:%d ABORTED - tx len:%d, "
-                               "rx len:%d",
+                               "%s %c%c%c%c d:%d ABORTED - tx len:%d, rx len:%d",
                                is_tx ? "Send Bulk to" : "Recv Bulk from",
                                VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
                                service->remoteport,
@@ -1648,8 +1646,7 @@ parse_rx_slots(struct vchiq_state *state)
                                ? service->base.fourcc
                                : VCHIQ_MAKE_FOURCC('?', '?', '?', '?');
                        vchiq_log_info(SRVTRACE_LEVEL(service),
-                               "Rcvd Msg %s(%u) from %c%c%c%c s:%d d:%d "
-                               "len:%d",
+                               "Rcvd Msg %s(%u) from %c%c%c%c s:%d d:%d len:%d",
                                msg_type_str(type), type,
                                VCHIQ_FOURCC_AS_4CHARS(svc_fourcc),
                                remoteport, localport, size);
@@ -1773,8 +1770,7 @@ parse_rx_slots(struct vchiq_state *state)
                                if ((int)(queue->remote_insert -
                                        queue->local_insert) >= 0) {
                                        vchiq_log_error(vchiq_core_log_level,
-                                               "%d: prs %s@%pK (%d->%d) "
-                                               "unexpected (ri=%d,li=%d)",
+                                               "%d: prs %s@%pK (%d->%d) unexpected (ri=%d,li=%d)",
                                                state->id, msg_type_str(type),
                                                header, remoteport, localport,
                                                queue->remote_insert,
@@ -1957,8 +1953,7 @@ slot_handler_func(void *v)
                                         * through outstanding messages.
                                         */
                                        vchiq_log_error(vchiq_core_log_level,
-                                               "Failed to send RESUME "
-                                               "message");
+                                               "Failed to send RESUME message");
                                }
                                break;
                        default:
@@ -2084,9 +2079,7 @@ sync_func(void *v)
                                        VCHIQ_MESSAGE_AVAILABLE, header,
                                        NULL) == VCHIQ_RETRY)
                                        vchiq_log_error(vchiq_sync_log_level,
-                                               "synchronous callback to "
-                                               "service %d returns "
-                                               "VCHIQ_RETRY",
+                                               "synchronous callback to service %d returns VCHIQ_RETRY",
                                                localport);
                        }
                        break;
@@ -2181,8 +2174,7 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero)
        if (local->initialised) {
                vchiq_loud_error_header();
                if (remote->initialised)
-                       vchiq_loud_error("local state has already been "
-                               "initialised");
+                       vchiq_loud_error("local state has already been initialised");
                else
                        vchiq_loud_error("master/slave mismatch two slaves");
                vchiq_loud_error_footer();
@@ -2719,8 +2711,7 @@ vchiq_close_service_internal(struct vchiq_service *service, int close_recvd)
        case VCHIQ_SRVSTATE_CLOSEWAIT:
                if (close_recvd)
                        vchiq_log_error(vchiq_core_log_level,
-                               "%s(1) called "
-                               "in state %s",
+                               "%s(1) called in state %s",
                                __func__, srvstate_names[service->srvstate]);
                else if (is_server) {
                        if (service->srvstate == VCHIQ_SRVSTATE_LISTENING) {
@@ -3533,8 +3524,7 @@ int vchiq_dump_state(void *dump_context, struct vchiq_state *state)
 
        if (VCHIQ_ENABLE_STATS) {
                len = scnprintf(buf, sizeof(buf),
-                       "  Stats: ctrl_tx_count=%d, ctrl_rx_count=%d, "
-                       "error_count=%d",
+                       "  Stats: ctrl_tx_count=%d, ctrl_rx_count=%d, error_count=%d",
                        state->stats.ctrl_tx_count, state->stats.ctrl_rx_count,
                        state->stats.error_count);
                err = vchiq_dump(dump_context, buf, len + 1);
@@ -3543,8 +3533,7 @@ int vchiq_dump_state(void *dump_context, struct vchiq_state *state)
        }
 
        len = scnprintf(buf, sizeof(buf),
-               "  Slots: %d available (%d data), %d recyclable, %d stalls "
-               "(%d data)",
+               "  Slots: %d available (%d data), %d recyclable, %d stalls (%d data)",
                ((state->slot_queue_available * VCHIQ_SLOT_SIZE) -
                        state->local_tx_pos) / VCHIQ_SLOT_SIZE,
                state->data_quota - state->data_use_count,
@@ -3639,8 +3628,7 @@ int vchiq_dump_service_state(void *dump_context, struct vchiq_service *service)
                        service->bulk_rx.remote_insert;
 
                len = scnprintf(buf, sizeof(buf),
-                       "  Bulk: tx_pending=%d (size %d),"
-                       " rx_pending=%d (size %d)",
+                       "  Bulk: tx_pending=%d (size %d), rx_pending=%d (size %d)",
                        tx_pending,
                        tx_pending ? service->bulk_tx.bulks[
                        BULK_INDEX(service->bulk_tx.remove)].size : 0,
@@ -3654,8 +3642,7 @@ int vchiq_dump_service_state(void *dump_context, struct vchiq_service *service)
                                return err;
 
                        len = scnprintf(buf, sizeof(buf),
-                               "  Ctrl: tx_count=%d, tx_bytes=%llu, "
-                               "rx_count=%d, rx_bytes=%llu",
+                               "  Ctrl: tx_count=%d, tx_bytes=%llu, rx_count=%d, rx_bytes=%llu",
                                service->stats.ctrl_tx_count,
                                service->stats.ctrl_tx_bytes,
                                service->stats.ctrl_rx_count,
@@ -3665,8 +3652,7 @@ int vchiq_dump_service_state(void *dump_context, struct vchiq_service *service)
                                return err;
 
                        len = scnprintf(buf, sizeof(buf),
-                               "  Bulk: tx_count=%d, tx_bytes=%llu, "
-                               "rx_count=%d, rx_bytes=%llu",
+                               "  Bulk: tx_count=%d, tx_bytes=%llu, rx_count=%d, rx_bytes=%llu",
                                service->stats.bulk_tx_count,
                                service->stats.bulk_tx_bytes,
                                service->stats.bulk_rx_count,
@@ -3676,8 +3662,7 @@ int vchiq_dump_service_state(void *dump_context, struct vchiq_service *service)
                                return err;
 
                        len = scnprintf(buf, sizeof(buf),
-                               "  %d quota stalls, %d slot stalls, "
-                               "%d bulk stalls, %d aborted, %d errors",
+                               "  %d quota stalls, %d slot stalls, %d bulk stalls, %d aborted, %d errors",
                                service->stats.quota_stalls,
                                service->stats.slot_stalls,
                                service->stats.bulk_stalls,
@@ -3699,11 +3684,9 @@ void
 vchiq_loud_error_header(void)
 {
        vchiq_log_error(vchiq_core_log_level,
-               "============================================================"
-               "================");
+               "============================================================================");
        vchiq_log_error(vchiq_core_log_level,
-               "============================================================"
-               "================");
+               "============================================================================");
        vchiq_log_error(vchiq_core_log_level, "=====");
 }
 
@@ -3712,11 +3695,9 @@ vchiq_loud_error_footer(void)
 {
        vchiq_log_error(vchiq_core_log_level, "=====");
        vchiq_log_error(vchiq_core_log_level,
-               "============================================================"
-               "================");
+               "============================================================================");
        vchiq_log_error(vchiq_core_log_level,
-               "============================================================"
-               "================");
+               "============================================================================");
 }
 
 enum vchiq_status vchiq_send_remote_use(struct vchiq_state *state)