Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ddb9dc6 authored by Gary R Hook's avatar Gary R Hook Committed by Herbert Xu
Browse files

crypto: ccp - clean up data structure 



Change names of data structure instances.  Add const
keyword where appropriate.  Add error handling path.

Signed-off-by: default avatarGary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8df4f27c

drivers/crypto/ccp/ccp-dev-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static const struct ccp_actions ccp3_actions = { 
	.irqhandler = ccp_irq_handler,

};



struct ccp_vdata ccpv3 = {

const struct ccp_vdata ccpv3 = {

	.version = CCP_VERSION(3, 0),

	.setup = NULL,

	.perform = &ccp3_actions,

drivers/crypto/ccp/ccp-dev-v5.c

+6 −3
Original line number Diff line number Diff line
@@ -835,10 +835,13 @@ static int ccp5_init(struct ccp_device *ccp) 
	/* Register the DMA engine support */

	ret = ccp_dmaengine_register(ccp);

	if (ret)

		goto e_kthread;

		goto e_hwrng;



	return 0;



e_hwrng:

	ccp_unregister_rng(ccp);



e_kthread:

	for (i = 0; i < ccp->cmd_q_count; i++)

		if (ccp->cmd_q[i].kthread)
@@ -994,7 +997,7 @@ static const struct ccp_actions ccp5_actions = { 
	.irqhandler = ccp5_irq_handler,

};



struct ccp_vdata ccpv5 = {

const struct ccp_vdata ccpv5a = {

	.version = CCP_VERSION(5, 0),

	.setup = ccp5_config,

	.perform = &ccp5_actions,
@@ -1002,7 +1005,7 @@ struct ccp_vdata ccpv5 = { 
	.offset = 0x0,

};



struct ccp_vdata ccpv5other = {

const struct ccp_vdata ccpv5b = {

	.version = CCP_VERSION(5, 0),

	.setup = ccp5other_config,

	.perform = &ccp5_actions,

drivers/crypto/ccp/ccp-dev.h

+3 −3
Original line number Diff line number Diff line
@@ -639,8 +639,8 @@ struct ccp_vdata { 
	const unsigned int offset;

};



extern	struct ccp_vdata ccpv3;

extern	struct ccp_vdata ccpv5;

extern	struct ccp_vdata ccpv5other;

extern const struct ccp_vdata ccpv3;

extern const struct ccp_vdata ccpv5a;

extern const struct ccp_vdata ccpv5b;



#endif

drivers/crypto/ccp/ccp-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -325,8 +325,8 @@ static int ccp_pci_resume(struct pci_dev *pdev) 


static const struct pci_device_id ccp_pci_table[] = {

	{ PCI_VDEVICE(AMD, 0x1537), (kernel_ulong_t)&ccpv3 },

	{ PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&ccpv5 },

	{ PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&ccpv5other },

	{ PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&ccpv5a },

	{ PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&ccpv5b },

	/* Last entry must be zero */

	{ 0, }

};