diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0130-crypto-ccp-Remove-forward-declaration.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0130-crypto-ccp-Remove-forward-declaration.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0130-crypto-ccp-Remove-forward-declaration.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0130-crypto-ccp-Remove-forward-declaration.patch new file mode 100644 index 00000000..2d7c97ed --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0130-crypto-ccp-Remove-forward-declaration.patch @@ -0,0 +1,100 @@ +From 363288449f6ef7beea25d397ce91f382875e278d Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor <natechancellor@gmail.com> +Date: Mon, 24 Sep 2018 10:26:15 -0700 +Subject: [PATCH 130/131] 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. + +Reported-by: Nick Desaulniers <ndesaulniers@google.com> +Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> +Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> +Acked-by: Gary R Hook <gary.hook@amd.com> +Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com> +--- + drivers/crypto/ccp/sp-platform.c | 53 +++++++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 28 deletions(-) + +diff --git a/drivers/crypto/ccp/sp-platform.c b/drivers/crypto/ccp/sp-platform.c +index 71734f2..b75dc7d 100644 +--- a/drivers/crypto/ccp/sp-platform.c ++++ b/drivers/crypto/ccp/sp-platform.c +@@ -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", +-- +2.7.4 + |