From patchwork Thu May 20 09:23:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 443224 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2182226jac; Thu, 20 May 2021 04:06:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0LwTlrG1RW3i40XaLznusAlUFfrSmrZfU63lfnGi4NDkgFCkZXA0F89vNVZ9QgwZS7/jY X-Received: by 2002:a05:6602:189:: with SMTP id m9mr4941307ioo.88.1621508773734; Thu, 20 May 2021 04:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621508773; cv=none; d=google.com; s=arc-20160816; b=cbBR3p0X5qdXdH+p00TZLq/ba+CM/5iN06Ekq87xWqq65r+1WwFUkUzj9J5VUetxQj wBxyIkCaMy+/o8SFL/vXGefOeQk77gKXV4ALIS8ENuHluiJRhhXSQhZ9UeVqMR0jgQHe PrxIVx6TIV+3B9femJLshN1lf4E9YrEO28g1TCZ9w9Z/675ugQi7wZuTojXSIRdTHpU+ cBXT8WqZUH8/7XKHDCft6JLMLWjT0OoGBsDWVVd+GU7gnnsMH76VVtqV5MQXsAO1+hVt 6RQfZ8Rff02qf1OdE4Xshlc0J2uWCPPE1+wYpvTuXXbRt/eZc6MB6uzYe3/yivvHKUNb K6ig== 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=DpHowD0k0EHpFJ1pWaXIgsH4VXmxbk8VK3HT5zgDUdY=; b=e2LQIAOdeUrJTTY/yIhVGOqJrmNFFs3NJIuY6sXi6IZ4LUwvBSw2hIQYjItcoVT2Ff eqhvYSPN6bgL4mf+itKJ0t8vNu9vv8BMDkWpJHa655b2/P3L3NODa2sXAr9ikAySceSc IX+c3kK1OhJb0k0oLYvGXqeoYRf3ukle6slrGP6rpQI+edpXK04gHL+s/Nobqkfb9Xv3 k9oEdKNN4bs94H5UafbIqYFDS4EyFguKeVOmsL0PtTdHjgmGn+xcFi4zFIVgF5coTRuI 2dDYT/5QPkbyK6wK821PoFYJnnx57Z4yuaYnu35zZiBjTlsbqWgpBeE0LReosh8FuN6c jd7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yEjbjR0G; 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 l21si1915452iow.25.2021.05.20.04.06.13; Thu, 20 May 2021 04:06:13 -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=yEjbjR0G; 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 S239008AbhETLHd (ORCPT + 12 others); Thu, 20 May 2021 07:07:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:38340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239136AbhETLFg (ORCPT ); Thu, 20 May 2021 07:05:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 70A7361D24; Thu, 20 May 2021 10:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505112; bh=FQzU1ywP14McHhXd/bP7dyfK9IQrVfQ81ynkrpqJyN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yEjbjR0GYxTox4rP7Cpp1PLBMRlSe2EdpUEgbUvbfbQAIlkEBXnp0TTxVMqKZX/GV b4vSSObNeyZ06+k4iag1fPR6JbsINPVfvQVlaM6fhg35W41vd/phTLSklxUHt//mCn SVdOFi5cbsAMpJwX9dPRDkPyQwMsJMMVKXzRKk9c= 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.9 229/240] isdn: capi: fix mismatched prototypes Date: Thu, 20 May 2021 11:23:41 +0200 Message-Id: <20210520092116.397874920@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092108.587553970@linuxfoundation.org> References: <20210520092108.587553970@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 @@ -845,7 +845,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; @@ -915,7 +915,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;