Commit 3512dcb4 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Herbert Xu
Browse files

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: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Acked-by: default avatarGary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 944585a6

drivers/crypto/ccp/sp-platform.c

+25 −28
Original line number Diff line number Diff line
@@ -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",

CRA Git | Maintained and supported by SUSTech CRA and CCSE