From patchwork Thu Dec 15 06:58:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 33530 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp192273wrn; Wed, 14 Dec 2022 23:15:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf66szN43OnEwPywyLTrPDFtsxhR+e5Dw0EhMOv5ZhTsnPG7YQ7JA5AHV/hmGWUDcSRiVh8V X-Received: by 2002:a17:906:84a:b0:7c1:7145:5b3c with SMTP id f10-20020a170906084a00b007c171455b3cmr12300359ejd.46.1671088538851; Wed, 14 Dec 2022 23:15:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671088538; cv=none; d=google.com; s=arc-20160816; b=HLvKO3U2WvuNS05Bt+O+Bd8LPXqp+RTmAiwWYbV2V2XhurVyiL+En6jxIHiSFrI6NR EPHm6muiuJJNiXB1HE4Tf+gANb+LolfbhYsIDVa/Z1q65fCFjJ1lX+KXON3aqj+q4ZMV k0RuiokEb7Y0nMtjGp99u374sR2wu7+KiMDUgM+ZEq2+IdXKUL57gClqUAc4pQnf+Maq XCagnElGz7VOwjFwaRNwwYGwfMwHWJ6QlY9fOM51G+mctXUGleeKMgFwe2yrp2ydpKRz Y5H1Jx7XMTSn0IR4o7PbELICIKwIvIuxCn5CKfHAbq3YIU6D+HWiQcDya5XZZpwjnkkf ekbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tG5b2j3sSZZjz7r4V2KTYf1A/9+HZDRW0aMnhn3L470=; b=N4YtP0Ou0uCEOOr5ILyw2CmRDZdPG4tDGIlXdnvYGDfNvZTVzPKZRZJcn2LNVR6NVp 4C7pqvTkkPEey195veEgrOypt3J958zDdsWOIGHN9yYxYpqPhVf4yPOt4elSKY/6efwD x6Oelr34bv7Eax/OPotqewOcpoEWCqjnWIAvcpZEb00djFuq9f6hO7ZRjsyYsPPemw15 yUYNhtQjZo3yfrGXCAZfCiE3Wz1GNtnn7KY7nRnaCWkDqvl7TqZ3Mdas5kUN82PZAA+N DWyibf6S2VxPi9ojfDhN15ZV5EINfOnMECzc3p1xv3rBgG5DM8tm5OfKrusqGj/IPo8y BxtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=v29rgrfb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k11-20020a1709062a4b00b007c080a3f372si11628218eje.363.2022.12.14.23.15.14; Wed, 14 Dec 2022 23:15:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=v29rgrfb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229697AbiLOHGR (ORCPT + 99 others); Thu, 15 Dec 2022 02:06:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229768AbiLOHF3 (ORCPT ); Thu, 15 Dec 2022 02:05:29 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10AA762E88; Wed, 14 Dec 2022 23:00:06 -0800 (PST) Received: from umang.jainideasonboard.com (unknown [IPv6:2401:4900:1f3e:7d24:3f0:3e81:fb16:ab4d]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CA6053282; Thu, 15 Dec 2022 07:59:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1671087605; bh=bi99o5HTeKn1WgSUzR8Gf6hBf97zxJfS5/vQ+tejeQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v29rgrfbdzbasqlZUDHOvGr3eoH087F5qC1Slb+4BsaZuPQxCApGK5dhRfiUprZtT s0laoSsA9xB0PEh1QYPaQ+9298iZPFzpxVSqar5qo/Q1YAFCMcvnQCuessLPeQMT44 EsOLtNKtlaxsbNJlhwqxsGzA/NY4lHbotLFHeEy8= From: Umang Jain To: linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Kees Cook , Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Dave Stevenson , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH 6/7] staging: vc04_services: Drop enum vchiq_status remnants Date: Thu, 15 Dec 2022 12:28:52 +0530 Message-Id: <20221215065853.34477-7-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221215065853.34477-1-umang.jain@ideasonboard.com> References: <20221215065853.34477-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752263335499373688?= X-GMAIL-MSGID: =?utf-8?q?1752263335499373688?= Drop all references to enum vchiq_status as they are no longer in use. Signed-off-by: Umang Jain --- .../include/linux/raspberrypi/vchiq.h | 4 ---- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 14 +++++++------- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 6 +++--- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h index 2ca4461d26ee..66965da11443 100644 --- a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h +++ b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h @@ -17,10 +17,6 @@ enum vchiq_reason { VCHIQ_BULK_RECEIVE_ABORTED /* service, -, bulk_userdata */ }; -enum vchiq_status { - VCHIQ_RETRY = 1 -}; - enum vchiq_bulk_mode { VCHIQ_BULK_MODE_CALLBACK, VCHIQ_BULK_MODE_BLOCKING, 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 102d13c85b5e..7ffc76141e3f 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -751,7 +751,7 @@ static int vchiq_is_connected(struct vchiq_instance *instance) int vchiq_connect(struct vchiq_instance *instance) { - enum vchiq_status status; + int status; struct vchiq_state *state = instance->state; if (mutex_lock_killable(&state->mutex)) { @@ -778,7 +778,7 @@ vchiq_add_service(struct vchiq_instance *instance, const struct vchiq_service_params_kernel *params, unsigned int *phandle) { - enum vchiq_status status; + int status; struct vchiq_state *state = instance->state; struct vchiq_service *service = NULL; int srvstate; @@ -839,7 +839,7 @@ int vchiq_bulk_transmit(struct vchiq_instance *instance, unsigned int handle, const void *data, unsigned int size, void *userdata, enum vchiq_bulk_mode mode) { - enum vchiq_status status; + int status; while (1) { switch (mode) { @@ -877,7 +877,7 @@ int vchiq_bulk_receive(struct vchiq_instance *instance, unsigned int handle, void *data, unsigned int size, void *userdata, enum vchiq_bulk_mode mode) { - enum vchiq_status status; + int status; while (1) { switch (mode) { @@ -915,7 +915,7 @@ vchiq_blocking_bulk_transfer(struct vchiq_instance *instance, unsigned int handl unsigned int size, enum vchiq_bulk_dir dir) { struct vchiq_service *service; - enum vchiq_status status; + int status; struct bulk_waiter_node *waiter = NULL, *iter; service = find_service_by_handle(instance, handle); @@ -1103,7 +1103,7 @@ service_callback(struct vchiq_instance *instance, enum vchiq_reason reason, */ if ((user_service->message_available_pos - instance->completion_remove) < 0) { - enum vchiq_status status; + int status; vchiq_log_info(vchiq_arm_log_level, "Inserting extra MESSAGE_AVAILABLE"); @@ -1330,7 +1330,7 @@ vchiq_keepalive_thread_func(void *v) struct vchiq_state *state = (struct vchiq_state *)v; struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state); - enum vchiq_status status; + int status; struct vchiq_instance *instance; unsigned int ka_handle; int ret; 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 3b36b0644ae3..3870a1d6be42 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -2591,7 +2591,7 @@ release_service_messages(struct vchiq_service *service) static int do_abort_bulks(struct vchiq_service *service) { - enum vchiq_status status; + int status; /* Abort any outstanding bulk transfers */ if (mutex_lock_killable(&service->bulk_mutex)) @@ -2611,7 +2611,7 @@ do_abort_bulks(struct vchiq_service *service) static int close_service_complete(struct vchiq_service *service, int failstate) { - enum vchiq_status status; + int status; int is_server = (service->public_fourcc != VCHIQ_FOURCC_INVALID); int newstate; @@ -3212,7 +3212,7 @@ vchiq_queue_message(struct vchiq_instance *instance, unsigned int handle, int vchiq_queue_kernel_message(struct vchiq_instance *instance, unsigned int handle, void *data, unsigned int size) { - enum vchiq_status status; + int status; while (1) { status = vchiq_queue_message(instance, handle, memcpy_copy_callback,