crypto: ccp: Remove forward declaration
Subsystems (2)
PATCH 1/1 crypto: ccp: Remove forward declaration
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one element
static const struct acpi_device_id sp_acpi_match[];
^1 warning generated.
Just remove the forward declarations and move the initializations up so that they can be used in sp_get_of_version and sp_get_acpi_version.
--- drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-)
drivers/crypto/ccp/sp-platform.c +25 -28
@@ -33,8 +33,31 @@ struct sp_platform {unsigned int irq_count; }; -static const struct acpi_device_id sp_acpi_match[]; -static const struct of_device_id sp_of_match[]; +static const struct sp_dev_vdata dev_vdata[] = { + { + .bar =0 , +#ifdef CONFIG_CRYPTO_DEV_SP_CCP + .ccp_vdata = &ccpv3_platform, +#endif + }, +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id sp_acpi_match[] = { + {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (acpi, sp_acpi_match); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id sp_of_match[] = { + { .compatible ="amd,ccp-seattle-v1a" , + .data = (const void *)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (of, sp_of_match); +#endif static struct sp_dev_vdata *sp_get_of_version (struct platform_device *pdev) {
@@ -201,32 +224,6 @@ static int sp_platform_resume(struct platform_device *pdev) }#endif -static const struct sp_dev_vdata dev_vdata[] = { - { - .bar =0 , -#ifdef CONFIG_CRYPTO_DEV_SP_CCP - .ccp_vdata = &ccpv3_platform, -#endif - }, -}; - -#ifdef CONFIG_ACPI -static const struct acpi_device_id sp_acpi_match[] = { - {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (acpi, sp_acpi_match); -#endif - -#ifdef CONFIG_OF -static const struct of_device_id sp_of_match[] = { - { .compatible ="amd,ccp-seattle-v1a" , - .data = (const void *)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (of, sp_of_match); -#endif -static struct platform_driver sp_platform_driver = { .driver = { .name ="ccp" ,
Signature · 1 line
2.19.0
Quoted 10 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.
I'm not going to out and out object to this just yet.
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Quoted 78 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-)drivers/crypto/ccp/sp-platform.c +25
-28@@ -33,8 +33,31 @@ struct sp_platform {unsigned int irq_count; }; -static const struct acpi_device_id sp_acpi_match[]; -static const struct of_device_id sp_of_match[]; +static const struct sp_dev_vdata dev_vdata[] = { + { + .bar =0 , +#ifdef CONFIG_CRYPTO_DEV_SP_CCP + .ccp_vdata = &ccpv3_platform, +#endif + }, +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id sp_acpi_match[] = { + {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (acpi, sp_acpi_match); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id sp_of_match[] = { + { .compatible ="amd,ccp-seattle-v1a" , + .data = (const void *)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (of, sp_of_match); +#endif static struct sp_dev_vdata *sp_get_of_version (struct platform_device *pdev) {@@ -201,32 +224,6 @@ static int sp_platform_resume(struct platform_device *pdev) }#endif -static const struct sp_dev_vdata dev_vdata[] = { - { - .bar =0 , -#ifdef CONFIG_CRYPTO_DEV_SP_CCP - .ccp_vdata = &ccpv3_platform, -#endif - }, -}; - -#ifdef CONFIG_ACPI -static const struct acpi_device_id sp_acpi_match[] = { - {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (acpi, sp_acpi_match); -#endif - -#ifdef CONFIG_OF -static const struct of_device_id sp_of_match[] = { - { .compatible ="amd,ccp-seattle-v1a" , - .data = (const void *)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (of, sp_of_match); -#endif -static struct platform_driver sp_platform_driver = { .driver = { .name ="ccp" ,
Quoted 9 lines · Gary R Hook
Quoted 8 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Quoted 8 lines
Quoted 2 lines
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.I'm not going to out and out object to this just yet.
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Hi Gary,
I can produce the warning with Clang 6.0 using the following set of commands:
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- allyesconfig ./scripts/config -d CONFIG_CPU_BIG_ENDIAN
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- olddefconfig
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- drivers/crypto/ccp/sp-platform.o
Nathan
Quoted 80 lines
Quoted 79 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-)drivers/crypto/ccp/sp-platform.c +25
-28@@ -33,8 +33,31 @@ struct sp_platform {unsigned int irq_count; }; -static const struct acpi_device_id sp_acpi_match[]; -static const struct of_device_id sp_of_match[]; +static const struct sp_dev_vdata dev_vdata[] = { + { + .bar =0 , +#ifdef CONFIG_CRYPTO_DEV_SP_CCP + .ccp_vdata = &ccpv3_platform, +#endif + }, +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id sp_acpi_match[] = { + {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (acpi, sp_acpi_match); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id sp_of_match[] = { + { .compatible ="amd,ccp-seattle-v1a" , + .data = (const void *)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (of, sp_of_match); +#endif static struct sp_dev_vdata *sp_get_of_version (struct platform_device *pdev) {@@ -201,32 +224,6 @@ static int sp_platform_resume(struct platform_device *pdev) }#endif -static const struct sp_dev_vdata dev_vdata[] = { - { - .bar =0 , -#ifdef CONFIG_CRYPTO_DEV_SP_CCP - .ccp_vdata = &ccpv3_platform, -#endif - }, -}; - -#ifdef CONFIG_ACPI -static const struct acpi_device_id sp_acpi_match[] = { - {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (acpi, sp_acpi_match); -#endif - -#ifdef CONFIG_OF -static const struct of_device_id sp_of_match[] = { - { .compatible ="amd,ccp-seattle-v1a" , - .data = (const void *)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (of, sp_of_match); -#endif -static struct platform_driver sp_platform_driver = { .driver = { .name ="ccp" ,
Quoted 21 lines · Nathan Chancellor
Quoted 9 lines · Gary R Hook
Quoted 8 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Quoted 8 lines
Quoted 2 lines
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.I'm not going to out and out object to this just yet.
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Hi Gary,
Quoted 7 lines
I can produce the warning with Clang 6.0 using the following set of commands:
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- allyesconfig
./scripts/config-dCONFIG_CPU_BIG_ENDIAN
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- olddefconfig
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu-drivers/crypto/ccp/sp-platform.o
No, I"m not getting a warning on my system. I get this:
ghook@taos:~/src/cryptodev-2.6/src$ make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- CFLAGS=-v arch/arm64/Makefile:27: ld does not support --fix-cortex-a53-843419; kernel may be susceptible to erratum arch/arm64/Makefile:40: LSE atomics not supported by binutils arch/arm64/Makefile:48: Detected assembler with broken .inst; disassembly will be unreliable CALL scripts/checksyscalls.sh VDSOA arch/arm64/kernel/vdso/gettimeofday.o arch/arm64/kernel/vdso/gettimeofday.S: Assembler messages: arch/arm64/kernel/vdso/gettimeofday.S:28: Error: no such instruction: `vdso_data .req x6' arch/arm64/kernel/vdso/gettimeofday.S:29: Error: no such instruction: `seqcnt .req w7' arch/arm64/kernel/vdso/gettimeofday.S:30: Error: no such instruction: `w_tmp .req w8' ...
The only reason I bring this up is that it would be helpful to be able to recreate results. I figure I'm not set up for this.
That said... please see my response to Nick.
Quoted 31 lines · Gary R Hook
Quoted 21 lines · Nathan Chancellor
Quoted 9 lines · Gary R Hook
Quoted 8 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Quoted 8 lines
Quoted 2 lines
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.I'm not going to out and out object to this just yet.
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Hi Gary,
Quoted 7 lines
I can produce the warning with Clang 6.0 using the following set of commands:
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- allyesconfig
./scripts/config-dCONFIG_CPU_BIG_ENDIAN
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- olddefconfig
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu-drivers/crypto/ccp/sp-platform.o
Quoted 7 lines
No, I"m not getting a warning on my system. I get this:
ghook@taos:~/src/cryptodev-2.6/src$ make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- CFLAGS=-v arch/arm64/Makefile:27: ld does not support --fix-cortex-a53-843419; kernel may be susceptible to erratum arch/arm64/Makefile:40: LSE atomics not supported by binutils
./scripts/config -d CONFIG_ARM64_LSE_ATOMICS
Quoted 17 lines
arch/arm64/Makefile:48: Detected assembler with broken .inst; disassembly will be unreliable
CALLscripts/checksyscalls.sh
VDSOAarch/arm64/kernel/vdso/gettimeofday.oarch/arm64/kernel/vdso/gettimeofday.S: Assembler messages:arch/arm64/kernel/vdso/gettimeofday.S:28: Error: no such instruction:
`vdso_data .req x6'arch/arm64/kernel/vdso/gettimeofday.S:29: Error: no such instruction:
`seqcnt .req w7'arch/arm64/kernel/vdso/gettimeofday.S:30: Error: no such instruction:
`w_tmp .req w8'
...The only reason I bring this up is that it would be helpful to be able to recreate results. I figure I'm not set up for this.
That said... please see my response to Nick.
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 34 lines · Nick Desaulniers
Quoted 33 lines · Gary R Hook
Quoted 21 lines · Nathan Chancellor
Quoted 9 lines · Gary R Hook
Quoted 8 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Quoted 8 lines
Quoted 2 lines
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.I'm not going to out and out object to this just yet.
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Hi Gary,
Quoted 7 lines
I can produce the warning with Clang 6.0 using the following set of commands:
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- allyesconfig
./scripts/config-dCONFIG_CPU_BIG_ENDIAN
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- olddefconfig
make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu-drivers/crypto/ccp/sp-platform.oNo, I"m not getting a warning on my system. I get this:
Quoted 8 lines
Quoted 5 lines
ghook@taos:~/src/cryptodev-2.6/src$ make ARCH=arm64 CC=clang CROSS_COMPILE=aarch64-linux-gnu- CFLAGS=-v arch/arm64/Makefile:27: ld does not support --fix-cortex-a53-843419; kernel may be susceptible to erratum arch/arm64/Makefile:40: LSE atomics not supported by binutils
./scripts/config-dCONFIG_ARM64_LSE_ATOMICS
D'oh, I keep forgetting to update my gist with my commands...
Thanks!
Quoted 23 lines
Quoted 17 lines
arch/arm64/Makefile:48: Detected assembler with broken .inst; disassembly will be unreliable
CALLscripts/checksyscalls.sh
VDSOAarch/arm64/kernel/vdso/gettimeofday.oarch/arm64/kernel/vdso/gettimeofday.S: Assembler messages:arch/arm64/kernel/vdso/gettimeofday.S:28: Error: no such instruction:
`vdso_data .req x6'arch/arm64/kernel/vdso/gettimeofday.S:29: Error: no such instruction:
`seqcnt .req w7'arch/arm64/kernel/vdso/gettimeofday.S:30: Error: no such instruction:
`w_tmp .req w8'
...The only reason I bring this up is that it would be helpful to be able to recreate results. I figure I'm not set up for this.
That said... please see my response to Nick.
Signature · 2 lines
Thanks, ~Nick Desaulniers
Nick Desaulniers
Reviewed-byQuoted 10 lines · Gary R Hook
Quoted 8 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Quoted 4 lines
Quoted 2 lines
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.I'm not going to out and out object to this just yet.
Tentative array definitions need to have the correct length specified; it should either be forward declared as the correct length, or as this patch does, skip the forward declare and move up the definition. Thanks for this patch Nathan.
Quoted 84 lines
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Quoted 78 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-)drivers/crypto/ccp/sp-platform.c +25
-28@@ -33,8 +33,31 @@ struct sp_platform {unsigned int irq_count; }; -static const struct acpi_device_id sp_acpi_match[]; -static const struct of_device_id sp_of_match[]; +static const struct sp_dev_vdata dev_vdata[] = { + { + .bar =0 , +#ifdef CONFIG_CRYPTO_DEV_SP_CCP + .ccp_vdata = &ccpv3_platform, +#endif + }, +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id sp_acpi_match[] = { + {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (acpi, sp_acpi_match); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id sp_of_match[] = { + { .compatible ="amd,ccp-seattle-v1a" , + .data = (const void *)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (of, sp_of_match); +#endif static struct sp_dev_vdata *sp_get_of_version (struct platform_device *pdev) {@@ -201,32 +224,6 @@ static int sp_platform_resume(struct platform_device *pdev) }#endif -static const struct sp_dev_vdata dev_vdata[] = { - { - .bar =0 , -#ifdef CONFIG_CRYPTO_DEV_SP_CCP - .ccp_vdata = &ccpv3_platform, -#endif - }, -}; - -#ifdef CONFIG_ACPI -static const struct acpi_device_id sp_acpi_match[] = { - {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (acpi, sp_acpi_match); -#endif - -#ifdef CONFIG_OF -static const struct of_device_id sp_of_match[] = { - { .compatible ="amd,ccp-seattle-v1a" , - .data = (const void *)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (of, sp_of_match); -#endif -static struct platform_driver sp_platform_driver = { .driver = { .name ="ccp" ,
Signature · 2 lines
Thanks, ~Nick Desaulniers
Gary R Hook
Acked-byQuoted 14 lines · Nick Desaulniers
Quoted 13 lines · Gary R Hook
Quoted 10 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.
Quoted 7 lines
Quoted 1 line
I'm not going to out and out object to this just yet.
Tentative array definitions need to have the correct length specified; it should either be forward declared as the correct length, or as this patch does, skip the forward declare and move up the definition. Thanks for this patch Nathan.
Reviewed-by Nick Desaulniers <[email protected]>
Checked my C99, and using both static and [] to create a declaration (because it's really a definition) apparently isn't valid. I should have known that. Since I'm old school...
Quoted 87 lines
Quoted 85 lines
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Quoted 78 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-)drivers/crypto/ccp/sp-platform.c +25
-28@@ -33,8 +33,31 @@ struct sp_platform {unsigned int irq_count; }; -static const struct acpi_device_id sp_acpi_match[]; -static const struct of_device_id sp_of_match[]; +static const struct sp_dev_vdata dev_vdata[] = { + { + .bar =0 , +#ifdef CONFIG_CRYPTO_DEV_SP_CCP + .ccp_vdata = &ccpv3_platform, +#endif + }, +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id sp_acpi_match[] = { + {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (acpi, sp_acpi_match); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id sp_of_match[] = { + { .compatible ="amd,ccp-seattle-v1a" , + .data = (const void *)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (of, sp_of_match); +#endif static struct sp_dev_vdata *sp_get_of_version (struct platform_device *pdev) {@@ -201,32 +224,6 @@ static int sp_platform_resume(struct platform_device *pdev) }#endif -static const struct sp_dev_vdata dev_vdata[] = { - { - .bar =0 , -#ifdef CONFIG_CRYPTO_DEV_SP_CCP - .ccp_vdata = &ccpv3_platform, -#endif - }, -}; - -#ifdef CONFIG_ACPI -static const struct acpi_device_id sp_acpi_match[] = { - {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (acpi, sp_acpi_match); -#endif - -#ifdef CONFIG_OF -static const struct of_device_id sp_of_match[] = { - { .compatible ="amd,ccp-seattle-v1a" , - .data = (const void *)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (of, sp_of_match); -#endif -static struct platform_driver sp_platform_driver = { .driver = { .name ="ccp" ,
Quoted 18 lines · Gary R Hook
Quoted 16 lines · Nick Desaulniers
Quoted 14 lines · Gary R Hook
Quoted 10 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.I'm not going to out and out object to this just yet.
Quoted 8 lines
Quoted 5 lines
Tentative array definitions need to have the correct length specified; it should either be forward declared as the correct length, or as this patch does, skip the forward declare and move up the definition. Thanks for this patch Nathan.
Reviewed-by Nick Desaulniers <[email protected]>Checked my C99, and using both static and [] to create a declaration
Note that the kernel uses gnu89, which is ISO C90 + gnu extensions (IIUC).
Quoted 94 lines
(because it's really a definition) apparently isn't valid. I should have known that. Since I'm old school...
Acked-by Gary R Hook <[email protected]>Quoted 87 lines
Quoted 85 lines
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Quoted 78 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-)drivers/crypto/ccp/sp-platform.c +25
-28@@ -33,8 +33,31 @@ struct sp_platform {unsigned int irq_count; }; -static const struct acpi_device_id sp_acpi_match[]; -static const struct of_device_id sp_of_match[]; +static const struct sp_dev_vdata dev_vdata[] = { + { + .bar =0 , +#ifdef CONFIG_CRYPTO_DEV_SP_CCP + .ccp_vdata = &ccpv3_platform, +#endif + }, +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id sp_acpi_match[] = { + {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (acpi, sp_acpi_match); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id sp_of_match[] = { + { .compatible ="amd,ccp-seattle-v1a" , + .data = (const void *)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (of, sp_of_match); +#endif static struct sp_dev_vdata *sp_get_of_version (struct platform_device *pdev) {@@ -201,32 +224,6 @@ static int sp_platform_resume(struct platform_device *pdev) }#endif -static const struct sp_dev_vdata dev_vdata[] = { - { - .bar =0 , -#ifdef CONFIG_CRYPTO_DEV_SP_CCP - .ccp_vdata = &ccpv3_platform, -#endif - }, -}; - -#ifdef CONFIG_ACPI -static const struct acpi_device_id sp_acpi_match[] = { - {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (acpi, sp_acpi_match); -#endif - -#ifdef CONFIG_OF -static const struct of_device_id sp_of_match[] = { - { .compatible ="amd,ccp-seattle-v1a" , - .data = (const void *)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (of, sp_of_match); -#endif -static struct platform_driver sp_platform_driver = { .driver = { .name ="ccp" ,
Signature · 2 lines
Thanks, ~Nick Desaulniers
Quoted 26 lines · Nick Desaulniers
Quoted 25 lines · Gary R Hook
Quoted 21 lines · Nick Desaulniers
Quoted 10 lines · Gary R Hook
Quoted 8 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Quoted 4 lines
Quoted 2 lines
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.I'm not going to out and out object to this just yet.
Tentative array definitions need to have the correct length specified; it should either be forward declared as the correct length, or as this patch does, skip the forward declare and move up the definition. Thanks for this patch Nathan.
Reviewed-by Nick Desaulniers <[email protected]>
Quoted 3 lines
Quoted 1 line
Checked my C99, and using both static and [] to create a declaration
Note that the kernel uses gnu89, which is ISO C90 + gnu extensions (IIUC).
I understand that (and appreciate that ubiquitousness of the dialect) but in this case it sounds like we are interested in the widest possible compatibility. Which makes the original patch problematic, and the fix suggested herein suitable.
Quoted 97 lines
Quoted 95 lines
(because it's really a definition) apparently isn't valid. I should have known that. Since I'm old school...
Acked-by Gary R Hook <[email protected]>Quoted 87 lines
Quoted 85 lines
I am not a clang expert. Can you please provide a make command that would explain how you precipitated this complaint?
Quoted 78 lines
Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-)drivers/crypto/ccp/sp-platform.c +25
-28@@ -33,8 +33,31 @@ struct sp_platform {unsigned int irq_count; }; -static const struct acpi_device_id sp_acpi_match[]; -static const struct of_device_id sp_of_match[]; +static const struct sp_dev_vdata dev_vdata[] = { + { + .bar =0 , +#ifdef CONFIG_CRYPTO_DEV_SP_CCP + .ccp_vdata = &ccpv3_platform, +#endif + }, +}; + +#ifdef CONFIG_ACPI +static const struct acpi_device_id sp_acpi_match[] = { + {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (acpi, sp_acpi_match); +#endif + +#ifdef CONFIG_OF +static const struct of_device_id sp_of_match[] = { + { .compatible ="amd,ccp-seattle-v1a" , + .data = (const void *)&dev_vdata[0 ] }, + { }, +}; +MODULE_DEVICE_TABLE (of, sp_of_match); +#endif static struct sp_dev_vdata *sp_get_of_version (struct platform_device *pdev) {@@ -201,32 +224,6 @@ static int sp_platform_resume(struct platform_device *pdev) }#endif -static const struct sp_dev_vdata dev_vdata[] = { - { - .bar =0 , -#ifdef CONFIG_CRYPTO_DEV_SP_CCP - .ccp_vdata = &ccpv3_platform, -#endif - }, -}; - -#ifdef CONFIG_ACPI -static const struct acpi_device_id sp_acpi_match[] = { - {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (acpi, sp_acpi_match); -#endif - -#ifdef CONFIG_OF -static const struct of_device_id sp_of_match[] = { - { .compatible ="amd,ccp-seattle-v1a" , - .data = (const void *)&dev_vdata[0 ] }, - { }, -}; -MODULE_DEVICE_TABLE (of, sp_of_match); -#endif -static struct platform_driver sp_platform_driver = { .driver = { .name ="ccp" ,
Herbert Xu
maintainerQuoted 8 lines · Nathan Chancellor
Clang emits a warning about this construct:
drivers/crypto/ccp/sp-platform.c:36:36: warning: tentative array definition assumed to have one elementstatic const struct acpi_device_id sp_acpi_match[]; ^1 warning generated.
Quoted 8 lines
Just remove the forward declarations and move the initializations up so that they can be used in
sp_get_of_versionandsp_get_acpi_version.Reported-by Nick Desaulniers <[email protected]>Signed-off-by Nathan Chancellor <[email protected]>--- drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 28 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt