From patchwork Fri Jun 21 13:19:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13707597 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8E48BC27C4F for ; Fri, 21 Jun 2024 13:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZXwrWBf/rp62OYEuRIGYrUMITYO0P9PC4nNEExUdWpc=; b=RcKekO2eGNBek4HesZym2DoPbK K6yD085lICaRO12+G1ROc2Kpc2ssSAickt4wdGfMxYgtPDCuL+S70BKLl+5E7uX1U7rqfBoiMHAJ9 QNKHx8nnYc73i37cjFNkYOgXjgZlkSVE/445mF8sdFMM05UrlIYojjHSy/84T+uiHCZCt9kcAZuX6 5PH65MCZZ8iBSs7lN8U7A6Vh51p9S2bQrPHRlnsM8pSNrbHhU27OX2jxsUIVePp0fVNmaBE2h1wcN JCqUu8yo0Y/WNQye6Rs6sis8V5rT1YvOXv4Z/0ORNtPnOwdWowd0/qen1Gz1Wb6JHjAtsnkA1C4PM ZWvrWboQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKeBr-00000009J8g-1JJZ; Fri, 21 Jun 2024 13:20:31 +0000 Received: from mout.gmx.net ([212.227.15.19]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKeBh-00000009J1G-15Co for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2024 13:20:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1718976016; x=1719580816; i=wahrenst@gmx.net; bh=ZXwrWBf/rp62OYEuRIGYrUMITYO0P9PC4nNEExUdWpc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=kYH9KBMGG1UxIjV4aFjsEVqfOKzYb+yC57LMqymgbDamJL69ovIPiyK9tkATK52p s6wZQrOoQXHD9Ew61cK7krqD4UeUCz5cWWTHjIL5sqAWLEBfppSw0nBeWX6FyB7Zv KvskyDFi8qFy1X+39Jdc79ZimOHna0MWu+ZpmgcSrxF+LjhABm8C86Fot9P9VpjPf LwnjAviGTyNL3B58NtSZMSBHx9e1/HHPNRSHHpMVbBmu9VDaCAElo7jX9QwuzkdJE 6LiYDuz9o7GbeLcjDDZ8Y8XkI3gqPq1C80gZUVOUpb13N0hPlthfcuRIdCKEAsbf8 gANl7OLM57EyLa1RrQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N5VDE-1sRnuk1AvC-017LH4; Fri, 21 Jun 2024 15:20:16 +0200 From: Stefan Wahren To: Greg Kroah-Hartman , Florian Fainelli Cc: Umang Jain , Laurent Pinchart , linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH V3 03/10] staging: vchiq_core: Drop non-functional struct members Date: Fri, 21 Jun 2024 15:19:51 +0200 Message-Id: <20240621131958.98208-4-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240621131958.98208-1-wahrenst@gmx.net> References: <20240621131958.98208-1-wahrenst@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:A4erY3WkkQxBrH9sLfavlJbsf+n1s7dr9APBk2FJNUhZAJ2Rfyw 6WxAjbU1+m+41ISlZsdIZV+jgwAU1oX409qdr4PtrTtkZXdad6Yb7VUAuT3925pNyVQenNs 1Yv+/QgiRAMin+bCOkTzyVp7KDiPV1SFEfTid4m2rmxkGEvoKoFLjrVNsDwWbXwylp80ot/ k+rM8U1Bgu5q9tNLFiDLg== UI-OutboundReport: notjunk:1;M01:P0:oyyimTcx9/U=;GywLyvU5Lc/o1y29x5NRqMZqlPp ghMI9raogF60qmERq+hLhg0+pViy2CKfRAnYck3MgqiOz1vbucsj++oBA9E8wPHusPNUGmI1r qRWBiVvJ/5xDnoZKAp1xUCYzQYovLJew4BE/REOOt7XdoNMrnWIhoavFNMPABXVdeJR8YGGpv oDcZWWLMKfoNYjmmLhKJJ6FnfEkkgiWJv2J95w2RfgxDM9Yt/IMzgKsfaz54RbZeFSLZxlG7R +sIWETGjplhhd2pCWi7k4nIH1vnTuogPvEJzZHPtFmwQPg38S/TMHsLmzWoRJRXc8wTDvdMlm iKydD9g4lEbV+ENvi9eUa9xWhHgvXHaVLPuEIts1DwbmQurV1Nh3ghIycnvG2iDzR2U8B/02F /Q+4Ng+cO7jcRintKVbPQgTZPgjVnOQPE/780xpLsi89IBS6cCD/z//haEvpE4SFIiNkAuj7U St8KCffojBqcX9taktDjrETO4ZLxZyAdDjmZSKWwpjP//1uR2rS44RqtHRIh3CpsbJMfhEBHn 4eXJb7S3oKy3kWB9ZC+RnXTk/UaUQUCCJpA3OsI2RSkRXpN0q28GciAn7n8vu6jgInPYRoPxA tSWEVIGbP/WofIlv5eduKpIrDIffksTMjuKFjX5Lnqe+uRUXRFI84S+R5u1Gbt6+qcg5F3cJu mECZI1FNzBjnz4qFHzRkcnua6/l8ZgogFQZCEhzEbYNlOT2poPjwjrjYDJF9ym5Sj0VwPrqCX dpxX3tnyQ8SV86pLIl8Di6ZJk4FGPzywqSWJ2A5SGQ+J0fDF1qmXKODk5pC8699fZT2luoAzd u1c7bYiu06jRedDvptdser2T/kSuR2FyvzSoaJrawt7FU= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240621_062021_674430_6544F2CA X-CRM114-Status: GOOD ( 10.15 ) 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 There are some struct members, which don't have a real function. So it's safe to drop them. Signed-off-by: Stefan Wahren Reviewed-by: Laurent Pinchart --- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 2 -- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 4 ---- 2 files changed, 6 deletions(-) -- 2.34.1 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 df3af821f218..51cfc366519b 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -2163,14 +2163,12 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero, s mutex_init(&state->slot_mutex); mutex_init(&state->recycle_mutex); mutex_init(&state->sync_mutex); - mutex_init(&state->bulk_transfer_mutex); spin_lock_init(&state->msg_queue_spinlock); spin_lock_init(&state->bulk_waiter_spinlock); spin_lock_init(&state->quota_spinlock); init_completion(&state->slot_available_event); - init_completion(&state->slot_remove_event); init_completion(&state->data_quota_event); state->slot_queue_available = 0; diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h index 382ec08f6a14..aac46e2a3b75 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -347,8 +347,6 @@ struct vchiq_state { struct mutex sync_mutex; - struct mutex bulk_transfer_mutex; - spinlock_t msg_queue_spinlock; spinlock_t bulk_waiter_spinlock; @@ -393,8 +391,6 @@ struct vchiq_state { /* Signalled when a free slot becomes available. */ struct completion slot_available_event; - struct completion slot_remove_event; - /* Signalled when a free data slot becomes available. */ struct completion data_quota_event;