From patchwork Thu May 20 09:24: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: 443230 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2196795jac; Thu, 20 May 2021 04:24:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoVLfx+/znWaE9qVV7hoaeewWGJ6j4b3wzFiadL2IX4HezHV54L82RWViRJaDwTskVE7HS X-Received: by 2002:a6b:7714:: with SMTP id n20mr4585559iom.126.1621509893966; Thu, 20 May 2021 04:24:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621509893; cv=none; d=google.com; s=arc-20160816; b=guzR9VTtH41TzMPEbn9eOp2akXnAnytBRTMgRon0b7/c9/I0VQ2blouCD6sBqGOo1H BfFU+84RSgwU/aKdGNE32sf96kq+v+OQUjzahUs60KqgWbga5FHETqpoorfSwSMBNJ1j HnMuPCuFrQE94IVGtQ3/yg8GbFUMBi6lc3hpePOFSt8oHSV51MHmwbSzvR95s0BePaDL kU/39N1/Il2inmbLbZaNc7oK+h60dOjVVxY/gJa5JZGhrgoemVybJfEfSvPNe/caNOzO hw/oeDpVNDtVHb+zpYuGj/t6vHt13QdHYWD3Y6qZr3mA6g5uOiefzf/Y5ph3PguTTx8m M7+g== 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=ktc/CFCj+580zJb0jW+MDe8FpxNWdePkleb+IEvf8O3Y086Sa9mylr0hOrZqMRmmxT R/k2QPdhTFn6nd25yj+lhOIBT/uOZaC/46M6YZCaP7zhcgM4VCQrjfqqm2K4uKBAkCnn Hb3ZnXmF/r2U8YyNjfofxlOWXiy9oc7byTPT+W6S5Okm8e6Bda2j/Q7517fUsWT7qfNH ZeIgoqDQH+TEgq5dlM4o6XBi6vI1B8PGtVmuivY/sBe+CXOPf7gan1xPAETyLwBEeDQb psu5rRtI9AFpvaYx7yz4EAP5La4iQhLnsVqyQyejccgLhnHJb3FzV32bCqm/K/LU24dN oJCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FW6mHrZD; 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 b11si1937604iok.1.2021.05.20.04.24.53; Thu, 20 May 2021 04:24:53 -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=FW6mHrZD; 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 S239140AbhETL0B (ORCPT + 12 others); Thu, 20 May 2021 07:26:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:45834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241276AbhETLYL (ORCPT ); Thu, 20 May 2021 07:24:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1FA4161D9C; Thu, 20 May 2021 10:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505542; bh=FQzU1ywP14McHhXd/bP7dyfK9IQrVfQ81ynkrpqJyN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FW6mHrZDyyAv1QI933dq2Qx2riVz0gatUXm8WCBKgiNrwQm56xTTaU3IIIsBslBWP +MlRF9Sf+stzDaHciCMFmjGYaxPlknM6YwLLSSV1BK5HYRa3M4ZjQXe6817jT7M6sS 8ME/lYRWBT3DFXXuwW2sShCCYBEzmXD3zjEDCM3k= 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.4 181/190] isdn: capi: fix mismatched prototypes Date: Thu, 20 May 2021 11:24:05 +0200 Message-Id: <20210520092108.142221944@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092102.149300807@linuxfoundation.org> References: <20210520092102.149300807@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;