From patchwork Sun Oct 3 19:58:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaston Gonzalez X-Patchwork-Id: 12533049 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8362C433F5 for ; Sun, 3 Oct 2021 20:05:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9ADFA61872 for ; Sun, 3 Oct 2021 20:05:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9ADFA61872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UR58W4+3hqrc0/jvqmBLSFy0nc+U3USFMlpycs/8LnU=; b=OW2WiY/cpqx56T CDmGaROpXQuNzUoq5dCLx0J+qd86ETzkNEaIJCx4WO5qZmVzt472lBsvNcOBsdzPCDeV9FL5Yzm8z 0/vRJhNKLPO4Bqp7OFe/G12868Q2vAFdWwN/Rob8bVMXYCX9rqxCmcQHMKpJq3uZMTvmsmQ6rj/sD G1UwfM5hO0Z2YzPSSSdJsWC/39KUlNITqyrVX0Rsbbp91lLfkeeyX/7TmPFIUODD60IDrCr12gfWk irr8b775HyRT1m5Fn11Z14yNTc73Z0a846Z6zNvPhvqcsw7AgkFF7QDSJ8xMrM/sI4AXUlQfqODTg twHSVnbjESvHX2cCy+Pw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mX7gz-004OcK-BO; Sun, 03 Oct 2021 20:02:38 +0000 Received: from mail-vs1-xe2f.google.com ([2607:f8b0:4864:20::e2f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mX7fs-004O8S-QN; Sun, 03 Oct 2021 20:01:30 +0000 Received: by mail-vs1-xe2f.google.com with SMTP id g10so2779893vsb.8; Sun, 03 Oct 2021 13:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7bP3U1yAZRt+u68NpbNq0nb+zKNPUwV3lLbZ4sFMYKk=; b=VPz19kliN98T8/mxR29yWivNGIFgd3VMZG6pMvmeyA6NkcltfkH5xI0DynISsOPkuC vYIkTEfsKpAZ+H6WNpiysN7vHnv3jK6GgRPETyJR4p1jrmQS8hO2KoFoQnllDUUADlLp gyS6IOzpLd0ZlipHFUypue4Q+Ucpy+tQuZadFlEDekDjaj9jg8S89mu+z0niMkyhB3SO GdwXIH0wW2EaOEjyXT1wK7+09sYe7o0nCYrbHZquLfC4AQsKGJQ1XXHVKAJqmFSfeWj9 WXupz0ZBxyu7sL68Z81Mlt73c3Hgy6v9QMcv8k7TABDiv8uIgy121zpP4MQ/EZmIQEoQ ANCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7bP3U1yAZRt+u68NpbNq0nb+zKNPUwV3lLbZ4sFMYKk=; b=UrQKtNXx58PAu2PyrYyYcBvKxXLamxovLrftT5HIpvW1WRuJi59Nn1LQY1ZpFWw7YU /Xl7VucYH7SXQbYwUAQlxQFJDQZ+XV8nIlsddQ8gE7O5QHlv4TsbI9niTLR4pMmTDSy+ sVwjTAtpGuNtdLnEM0KjWpQaviSasOF28lBeMUI+4dB8s0zT/8ghs35MSl2ys9DRscHU RSteEXi0tnxGMDMOPcTBtiTbJAyT4JW+waRNtLB4DdB0+pq3CB/n8//KJaONo/I0/vNC JyO8Qb8UdMy3UuACmnci3w1yVn0Gi9YEUtkc4Q7E+PpEN7qJoSBk76lKnxIBe5MuolFa nBSw== X-Gm-Message-State: AOAM530a2/6Q5b7vweZENp/WkVLyuYWtHejKifzu+THneYiqPUU9HIJ+ KnGl0YQxEJhf+CJA9GV38fI= X-Google-Smtp-Source: ABdhPJzktHhae8DX+eZEXR+RgndZY7/aOkqVP8Bkce0LaukNnLWshpoum9Qyg5P9+1mwKRsATJ1kcg== X-Received: by 2002:a67:f147:: with SMTP id t7mr10547572vsm.41.1633291287189; Sun, 03 Oct 2021 13:01:27 -0700 (PDT) Received: from localhost.localdomain ([181.23.73.135]) by smtp.gmail.com with ESMTPSA id x21sm6691019uao.2.2021.10.03.13.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Oct 2021 13:01:26 -0700 (PDT) From: Gaston Gonzalez To: linux-staging@lists.linux.dev Cc: gregkh@linuxfoundation.org, nsaenz@kernel.org, stefan.wahren@i2se.com, arnd@arndb.de, dan.carpenter@oracle.com, ojaswin98@gmail.com, amarjargal16@gmail.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, gascoar@gmail.com Subject: [PATCH 7/9] staging: vchiq_core: cleanup lines that end with '(' or '[' Date: Sun, 3 Oct 2021 16:58:00 -0300 Message-Id: <20211003195758.36572-8-gascoar@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211003195758.36572-1-gascoar@gmail.com> References: <20211003195758.36572-1-gascoar@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211003_130128_919473_169D4333 X-CRM114-Status: GOOD ( 10.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fix lines that end with '(' or '['. Reported by checkpatch.pl Signed-off-by: Gaston Gonzalez --- .../interface/vchiq_arm/vchiq_core.c | 30 +++++++------------ 1 file changed, 10 insertions(+), 20 deletions(-) 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 026c7c775e40..b4ad68ff42db 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -699,8 +699,7 @@ reserve_space(struct vchiq_state *state, size_t space, int is_blocking) return NULL; } - slot_index = local->slot_queue[ - SLOT_QUEUE_INDEX_FROM_POS_MASKED(tx_pos)]; + slot_index = local->slot_queue[SLOT_QUEUE_INDEX_FROM_POS_MASKED(tx_pos)]; state->tx_data = (char *)SLOT_DATA_FROM_INDEX(state, slot_index); } @@ -854,18 +853,15 @@ process_free_queue(struct vchiq_state *state, BITSET_T *service_found, } static ssize_t -memcpy_copy_callback( - void *context, void *dest, - size_t offset, size_t maxsize) +memcpy_copy_callback(void *context, void *dest, size_t offset, size_t maxsize) { memcpy(dest + offset, context + offset, maxsize); return maxsize; } static ssize_t -copy_message_data( - ssize_t (*copy_callback)(void *context, void *dest, - size_t offset, size_t maxsize), +copy_message_data(ssize_t (*copy_callback)(void *context, void *dest, size_t offset, + size_t maxsize), void *context, void *dest, size_t size) @@ -946,8 +942,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service, * Ensure this service doesn't use more than its quota of * messages or slots */ - tx_end_index = SLOT_QUEUE_INDEX_FROM_POS( - state->local_tx_pos + stride - 1); + tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos + stride - 1); /* * Ensure data messages don't use more than their quota of @@ -959,14 +954,12 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service, spin_unlock("a_spinlock); mutex_unlock(&state->slot_mutex); - if (wait_for_completion_interruptible( - &state->data_quota_event)) + if (wait_for_completion_interruptible(&state->data_quota_event)) return VCHIQ_RETRY; mutex_lock(&state->slot_mutex); spin_lock("a_spinlock); - tx_end_index = SLOT_QUEUE_INDEX_FROM_POS( - state->local_tx_pos + stride - 1); + tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos + stride - 1); if ((tx_end_index == state->previous_data_index) || (state->data_use_count < state->data_quota)) { /* Pass the signal on to other waiters */ @@ -985,8 +978,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service, quota->message_use_count, quota->slot_use_count); VCHIQ_SERVICE_STATS_INC(service, quota_stalls); mutex_unlock(&state->slot_mutex); - if (wait_for_completion_interruptible( - "a->quota_event)) + if (wait_for_completion_interruptible("a->quota_event)) return VCHIQ_RETRY; if (service->closing) return VCHIQ_ERROR; @@ -998,8 +990,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service, return VCHIQ_ERROR; } spin_lock("a_spinlock); - tx_end_index = SLOT_QUEUE_INDEX_FROM_POS( - state->local_tx_pos + stride - 1); + tx_end_index = SLOT_QUEUE_INDEX_FROM_POS(state->local_tx_pos + stride - 1); } spin_unlock("a_spinlock); @@ -3088,8 +3079,7 @@ enum vchiq_status vchiq_bulk_transfer(unsigned int handle, void *offset, void __ VCHIQ_SERVICE_STATS_INC(service, bulk_stalls); do { mutex_unlock(&service->bulk_mutex); - if (wait_for_completion_interruptible( - &service->bulk_remove_event)) { + if (wait_for_completion_interruptible(&service->bulk_remove_event)) { status = VCHIQ_RETRY; goto error_exit; }