From patchwork Thu May 20 09:22:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443205 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2145950jac; Thu, 20 May 2021 03:15:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7D9zAWf9lGLBQqYGiXBP2I3Scrdi1LJIsKPx0Jv8W5PuLXMB3nYWLlWFQsMDrymJIalNe X-Received: by 2002:a02:970c:: with SMTP id x12mr5039482jai.21.1621505707605; Thu, 20 May 2021 03:15:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621505707; cv=none; d=google.com; s=arc-20160816; b=RmYMsjEEEb8gIvCIUVlPpgpizBheVIlXi0dWxgCq7C9w7vb1/tDgJoeDHl9bBDbx4f ACUCdPRVZMjyDOmjuI7nHS7tcS1c0nL0KjMCo4QHKrHZiE/MECpw1mSYfCX/xG/ds3pY p9Cc+43Il+N+f7AAEqkaYKyr1YZz+o4HlTHEk70lJDDVap9eU/PqttCR988CKAFQ5svF GqA74Ur+3QdsZxprj67DkdmZ3N0q2CCGuEpfx9oFeaXG/YYLRjDf1SwrHz1TPFIezYCW CngvtwVXNIlaeukjANJ6hhHc4H+/lgLGNpqqgtuhBHL/S43uFjBRRCYJRZYUoL3oVO5D ggfQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XeGtR1ht8OEAvYWkP7rsbCDn2jJ3mtemPe0iI0ETqxM=; b=VJ19mzP3dmRNzFihZ3nZaal6IdmbyR73PYOBYzjAKU6VlitQmodhhTinywkjwCMRF9 MLrBPv36T9e+zVjREY8Rmx7OBiLSynee+6SCUkPIMMatSZLUdTXi4x1BuBqn0cIPb4Wi EJ2og0d4jntJnN59tHn53B0Q2DTJHhNAUbIY0Wzc2+YNWyiJtr7Yt0+NSFHx4MD3uQ8R E/rny4g5gcLt3Hjg4GxJmXiJn0BGyEXJbsyLBDDsE26TtYgoyl8R2dw/jtxObSVmvEGu MdGzT1puPenMNI+yoZdFAy4bowpJt2kIoN7SF4wQ7NxgY3IDeWYV3Dj0fPmmQjnDsfsk rkKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IZs8pCBo; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si1896537jaq.76.2021.05.20.03.15.07; Thu, 20 May 2021 03:15:07 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IZs8pCBo; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235665AbhETKQZ (ORCPT + 12 others); Thu, 20 May 2021 06:16:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:47608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235837AbhETKMr (ORCPT ); Thu, 20 May 2021 06:12:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A4D5613DB; Thu, 20 May 2021 09:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621503831; bh=sQUr7wMd8s3DIqyuZRmOuqrOcv9uqv1kTGFw0veOYtk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IZs8pCBoCwQ8/Q63YMPwrFApq7jTucH1j+aMsholl76QBiaWszNd06MngujPoWRVx 30/7nV2YtINUjdSFwBkji98WlBo4MUWOW8PQnAI9u0XkT2OuUuARryoBj/iQw9siKt XYkOBzV0R6aMIj7rTGBcNTphhuazu/RkFF53oEPY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , "David S. Miller" Subject: [PATCH 4.19 398/425] isdn: capi: fix mismatched prototypes Date: Thu, 20 May 2021 11:22:47 +0200 Message-Id: <20210520092144.478344041@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092131.308959589@linuxfoundation.org> References: <20210520092131.308959589@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 5ee7d4c7fbc9d3119a20b1c77d34003d1f82ac26 upstream. gcc-11 complains about a prototype declaration that is different from the function definition: drivers/isdn/capi/kcapi.c:724:44: error: argument 2 of type ‘u8 *’ {aka ‘unsigned char *’} declared as a pointer [-Werror=array-parameter=] 724 | u16 capi20_get_manufacturer(u32 contr, u8 *buf) | ~~~~^~~ In file included from drivers/isdn/capi/kcapi.c:13: drivers/isdn/capi/kcapi.h:62:43: note: previously declared as an array ‘u8[64]’ {aka ‘unsigned char[64]’} 62 | u16 capi20_get_manufacturer(u32 contr, u8 buf[CAPI_MANUFACTURER_LEN]); | ~~~^~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/isdn/capi/kcapi.c:790:38: error: argument 2 of type ‘u8 *’ {aka ‘unsigned char *’} declared as a pointer [-Werror=array-parameter=] 790 | u16 capi20_get_serial(u32 contr, u8 *serial) | ~~~~^~~~~~ In file included from drivers/isdn/capi/kcapi.c:13: drivers/isdn/capi/kcapi.h:64:37: note: previously declared as an array ‘u8[8]’ {aka ‘unsigned char[8]’} 64 | u16 capi20_get_serial(u32 contr, u8 serial[CAPI_SERIAL_LEN]); | ~~~^~~~~~~~~~~~~~~~~~~~~~~ Change the definition to make them match. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/isdn/capi/kcapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c @@ -846,7 +846,7 @@ EXPORT_SYMBOL(capi20_put_message); * Return value: CAPI result code */ -u16 capi20_get_manufacturer(u32 contr, u8 *buf) +u16 capi20_get_manufacturer(u32 contr, u8 buf[CAPI_MANUFACTURER_LEN]) { struct capi_ctr *ctr; u16 ret; @@ -916,7 +916,7 @@ EXPORT_SYMBOL(capi20_get_version); * Return value: CAPI result code */ -u16 capi20_get_serial(u32 contr, u8 *serial) +u16 capi20_get_serial(u32 contr, u8 serial[CAPI_SERIAL_LEN]) { struct capi_ctr *ctr; u16 ret;