| Message ID | 20210322164447.876440-1-arnd@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | isdn: capi: fix mismatched prototypes | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Mon, 22 Mar 2021 17:44:29 +0100 you wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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]); > | ~~~^~~~~~~~~~~~~~~~~~~~~~~ > > [...] Here is the summary with links: - isdn: capi: fix mismatched prototypes https://git.kernel.org/netdev/net/c/5ee7d4c7fbc9 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index 7168778fbbe1..cb0afe897162 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c @@ -721,7 +721,7 @@ u16 capi20_put_message(struct capi20_appl *ap, struct sk_buff *skb) * 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 capi_version *verp) * 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;