From patchwork Tue Jan 17 16:39:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13104870 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 98C63C3DA78 for ; Tue, 17 Jan 2023 16:41:27 +0000 (UTC) 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: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:In-Reply-To:References: List-Owner; bh=ipFEK4H9dSJvO8wQ1Ob46JlyEU08unBEvFGuxK6s4AQ=; b=kOE6ya6TXq3adK gT/jbdEc4TPdDvA97vXdK7XGnnWGxX8qFNPaQHZzVFUmtwfidNs6mmxOJk8PgKYqe16Egt/p9LyUK SzlOfsh/sj3ONHDUIzmtBjmYat+OS3yCE80muVugMd5l2vDOxVMTaydQdc+9H7/PifxbNDnZjjllB nhZmRWA1D5bzPU5bPlzpmk5t5gFyy33YHw6PSINACaKElWRBNewmDipIshHwpmb+vXHJ2svNmFZ7y Xa/bSaGx5+fnoGJjMKxfVo0F3yHFYlvEBsr/UJuYzcQqW7yvruzB1D+0xjteZlb8oWY0QLNh9p7/v hlFNUGwiodQK3MUs27SA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHp0L-00F7sV-4F; Tue, 17 Jan 2023 16:40:09 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHp0H-00F7rx-Ft; Tue, 17 Jan 2023 16:40:06 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4EFEB614B7; Tue, 17 Jan 2023 16:40:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE44CC433EF; Tue, 17 Jan 2023 16:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673973602; bh=8FfTQZrqyhnZxAAYd4VyprghfHyBrSE/ve6LyDRtWTk=; h=From:To:Cc:Subject:Date:From; b=oYoZOPhi7sLGeQdjqXEzkYfVO0oZyyN+isGYwClSsk+NynvndqE2R5OvvL0WQJA7p 12mc3xH+iu3JVpQNY5qCVK4pIbscQApA99AE69u1PkAqjvSQoDbmOKwZxDsi+gVpuV a6PHnU3ZbXIGq7iRDi9o9w2qd8I2sBJX2k0mjZdce1UfLRoo4vqnlTF1ZIoIdDty5w RAnDaSyLmnHxKxQ5CaTvV7TMEpqbi0HpzzK5QtyJsVvZ+1qH5jVLMhhP3J5pEEIdwK 17m5KoEweHls4uxnyKxcYaCbhddRzEUqiiwCvVptGyxOdjUGdzvTYQdLj8d/YyeUmc v1IuNVQblHQiQ== From: Arnd Bergmann To: Greg Kroah-Hartman , Florian Fainelli Cc: Arnd Bergmann , Broadcom internal kernel review list , Adrien Thierry , Nicolas Saenz Julienne , Stefan Wahren , linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: vchiq_arm: fix enum vchiq_status return types Date: Tue, 17 Jan 2023 17:39:32 +0100 Message-Id: <20230117163957.1109872-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230117_084005_652429_6D1867C6 X-CRM114-Status: GOOD ( 13.99 ) 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 From: Arnd Bergmann gcc-13 notices a type mismatch between function declaration and definition for a few functions that have been converted from returning vchiq specific status values to regular error codes: drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:662:5: error: conflicting types for 'vchiq_initialise' due to enum/integer mismatch; have 'int(struct vchiq_instance **)' [-Werror=enum-int-mismatch] drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:1411:1: error: conflicting types for 'vchiq_use_internal' due to enum/integer mismatch; have 'int(struct vchiq_state *, struct vchiq_service *, enum USE_TYPE_E)' [-Werror=enum-int-mismatch] drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:1468:1: error: conflicting types for 'vchiq_release_internal' due to enum/integer mismatch; have 'int(struct vchiq_state *, struct vchiq_service *)' [-Werror=enum-int-mismatch] Change the declarations to match the actual function definition. Fixes: a9fbd828be7f ("staging: vchiq_arm: drop enum vchiq_status from vchiq_*_internal") Signed-off-by: Arnd Bergmann --- .../staging/vc04_services/include/linux/raspberrypi/vchiq.h | 2 +- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h index db1441c0cc66..690ab7165b2c 100644 --- a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h +++ b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h @@ -86,7 +86,7 @@ struct vchiq_service_params_kernel { struct vchiq_instance; -extern enum vchiq_status vchiq_initialise(struct vchiq_instance **pinstance); +extern int vchiq_initialise(struct vchiq_instance **pinstance); extern enum vchiq_status vchiq_shutdown(struct vchiq_instance *instance); extern enum vchiq_status vchiq_connect(struct vchiq_instance *instance); extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance, diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h index 2851ef6b9cd0..cd20eb18f275 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h @@ -100,10 +100,10 @@ vchiq_dump_platform_use_state(struct vchiq_state *state); extern void vchiq_dump_service_use_state(struct vchiq_state *state); -extern enum vchiq_status +extern int vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service, enum USE_TYPE_E use_type); -extern enum vchiq_status +extern int vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service);