From patchwork Thu May 20 09:22:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443177 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2b0d:0:0:0:0 with SMTP id gc13csp2432488ejc; Thu, 20 May 2021 02:33:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2HVFhN4Qcj6o2WKhibGGReH7zt1Of/4SeY36PJ9Fz8qvEmzxZFHLpv7P1p6+9OGnI18YA X-Received: by 2002:a05:6e02:1d9e:: with SMTP id h30mr3697787ila.214.1621503217259; Thu, 20 May 2021 02:33:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621503217; cv=none; d=google.com; s=arc-20160816; b=uEBRKuxJpvOzJmI1+J8iaUTPN2sz9S0xASkdZSB8V34GnNCkLXCrJnygt3rgSIkQMS chCla0+zUeX8mZbiWZLVvFqyXHEazSezPtohhg0Gj+A5ors1JDg9P2Jt9ia06w1ieHdG HnOMqnBIuBdBKtBHRoc8DR8MHR7sTcHDRezv6HmSiN6QvlOq/cPP+USX2uhgPOhzYQx0 LuSCgW1+HRznYwFzED93FdXEnbRROrvGMjaB4PckdGzk9O5hz2hvD2CnjiW0HjqW4+SI ddWCqlg+p38b9f5Ng0yL3Q5HKIuns9mV+AcCLKtI8EkywudWmbNoD0hxflipBzVDbj4d y/KQ== 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=njedsgnHjdTi2+PpTTQ9edw0qxImA92EuStREnI6Ejca6PXQOd3A96/2nh3BJHLrn5 SGWXsYCpNu09gYwb1wryWX3wwCGCRk2Na3Wmzz4KUcZloZ/UBETzB7mMUNAv1tIvNq0M Dn+yuXG+jJG1dZazGSEKjIH+bGRJVUKnlXuD68LL5sRfZ45/SpBA0lK8SqhTeTAHf0bi VyF2OyNRpQ0+lfKDZeragXy6LyJskQUcTidZijoW1WKkmDFKtNyUTcRgVsIdzDzGgnFu EGL16K3XC7llvCaGFOmInNj0Fvw0Rloi8e7OugVmnD4MJy6EBdnexYIsxJK1NZ1jyEWy R6og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZPQlpu+y; 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 s4si1948975jan.21.2021.05.20.02.33.37; Thu, 20 May 2021 02:33:37 -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=ZPQlpu+y; 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 S232132AbhETJev (ORCPT + 12 others); Thu, 20 May 2021 05:34:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:33028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232171AbhETJc0 (ORCPT ); Thu, 20 May 2021 05:32:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AD3CC613CC; Thu, 20 May 2021 09:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502903; bh=sQUr7wMd8s3DIqyuZRmOuqrOcv9uqv1kTGFw0veOYtk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZPQlpu+yxVwBa1A6iehD04uZuYMewp6dSnGDM3VzEYxgoNnZfRktbHtM5Yxu8gTmv gQ61BOJujOOfJO7xt2wmpzsy/XezYk9L5EPwsNtmcHFjlS8mpDYns7gSMoC6mClJ9R Ed6K6cL8TMsyu3pT0kjTmx8aosHroBY/Bo/I5jgI= 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 5.4 05/37] isdn: capi: fix mismatched prototypes Date: Thu, 20 May 2021 11:22:26 +0200 Message-Id: <20210520092052.444796765@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092052.265851579@linuxfoundation.org> References: <20210520092052.265851579@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;