From patchwork Thu May 20 09:22:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443172 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2112469jac; Thu, 20 May 2021 02:28:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4rNNLn/TdTL6NnVv46ytmpxhhokDDN4Ga9oWn/T0mObU4gV1jLQFvCRqLHq02+txBQQ0T X-Received: by 2002:a17:906:ce49:: with SMTP id se9mr3917028ejb.92.1621502915190; Thu, 20 May 2021 02:28:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621502915; cv=none; d=google.com; s=arc-20160816; b=uKtOYkTog6BHLbCVp61FJFxd+8et3lUA2HKNydtBXWIIIz/HeiCHSQP0sa+1gS3/3W w97ctwCMNoowEXINmc8o3bHMwnwXD3rgfu+pu6O/l4M6hw/4GQaikoq0hLF8htM8SCJ+ HsMrY4UeCuHdQ43QSUPEXxzjey9bQnGfYz2/YTkcik+bOzv5scSGXiCK/bOuTbWe3LUD MwRgCeGZUuT991Mcp6V7MbQxfb+kN3FtgKiY0Ibjjeo+/9RLSmCrMnl0WG0s3XGYhz+O PnyFk4LujEv8saI/Lw9p7er41xPiSQtrjttqFHZjQh0F5qGnpEHXLzF+jfh5VgeHLher yvWA== 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=cKBpCVxUBgbsrOOx2bI/fhSVfKuCbnqAQCXGrvIbd4A=; b=pNDvCm31br6O0WRzKubh4kwWcK/a87rZvfbujSPofydYjBdPZwWv5p6d+Wr/TRE7hG VmWjCRCug8HgFdlENiv4NJ7brOeIQS5Kb6McXLGE1fUUwq8aFBjgLIFD9jvRnKRmdUBr u9QhjfHuWpyn6f5WIiMtghBXtfhBEAxIvCt4P8zSs6VKAel6NRkYTs5KXZivccCLbXWV w+BQNY+5RWBUvzMSM1qcN1XBTPfFm+XDCB7aFiBIJWdKKPVlw1ZnAV6rIUQW2vRRj1Ph eRGjG5xIpNq4OSnYEYdil75uZHhHS+Q0lOYGjHSq7cCK98OZvvBvypSABQan8VO+5c+x ZuTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kLWSrhFr; 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 c7si2092112ejd.399.2021.05.20.02.28.35; Thu, 20 May 2021 02:28:35 -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=kLWSrhFr; 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 S231756AbhETJ3y (ORCPT + 12 others); Thu, 20 May 2021 05:29:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:53334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232124AbhETJ2F (ORCPT ); Thu, 20 May 2021 05:28:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 052D3613D4; Thu, 20 May 2021 09:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502797; bh=NZQEPQYccewLr+VRuJ61RYKbXOqWqPAxAxbdO+r18iY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kLWSrhFrUdl9eNVFUCbycbGD1s0tWrAKK22e4lA1FpquP/1Dvsw3uxNwE2YpJuHbM B9xXTvq0b1RC6HTzUtBlMJbZO+NL/hiT7dyzYanwAqzDwgeiIjc+2DgrqcqefdGV5L udQZbXiYQ3+oLjfp0C5Z0YXzcoo7eDKNQdaEFwv4= 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.10 07/47] isdn: capi: fix mismatched prototypes Date: Thu, 20 May 2021 11:22:05 +0200 Message-Id: <20210520092053.794437463@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092053.559923764@linuxfoundation.org> References: <20210520092053.559923764@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 @@ -721,7 +721,7 @@ u16 capi20_put_message(struct capi20_app * 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; @@ -787,7 +787,7 @@ u16 capi20_get_version(u32 contr, struct * 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;