p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: ccp - clean up data structure 

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

Signed-off-by: Gary R Hook <gary.hook@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Gary R Hook 2016-09-28 11:53:47 -05:00 committed by Herbert Xu
parent 8df4f27c04
commit 9ddb9dc6be
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/ccp/ccp-dev-v3.c
View File

@ -566,7 +566,7 @@ static const struct ccp_actions ccp3_actions = {
.irqhandler = ccp_irq_handler, .irqhandler = ccp_irq_handler,
}; };
struct ccp_vdata ccpv3 = { const struct ccp_vdata ccpv3 = {
.version = CCP_VERSION(3, 0), .version = CCP_VERSION(3, 0),
.setup = NULL, .setup = NULL,
.perform = &ccp3_actions, .perform = &ccp3_actions,

9
drivers/crypto/ccp/ccp-dev-v5.c
View File

@ -835,10 +835,13 @@ static int ccp5_init(struct ccp_device *ccp)
/* Register the DMA engine support */ /* Register the DMA engine support */
ret = ccp_dmaengine_register(ccp); ret = ccp_dmaengine_register(ccp);
if (ret) if (ret)
goto e_kthread; goto e_hwrng;
return 0; return 0;
e_hwrng:
ccp_unregister_rng(ccp);
e_kthread: e_kthread:
for (i = 0; i < ccp->cmd_q_count; i++) for (i = 0; i < ccp->cmd_q_count; i++)
if (ccp->cmd_q[i].kthread) if (ccp->cmd_q[i].kthread)
@ -994,7 +997,7 @@ static const struct ccp_actions ccp5_actions = {
.irqhandler = ccp5_irq_handler, .irqhandler = ccp5_irq_handler,
}; };
struct ccp_vdata ccpv5 = { const struct ccp_vdata ccpv5a = {
.version = CCP_VERSION(5, 0), .version = CCP_VERSION(5, 0),
.setup = ccp5_config, .setup = ccp5_config,
.perform = &ccp5_actions, .perform = &ccp5_actions,
@ -1002,7 +1005,7 @@ struct ccp_vdata ccpv5 = {
.offset = 0x0, .offset = 0x0,
}; };
struct ccp_vdata ccpv5other = { const struct ccp_vdata ccpv5b = {
.version = CCP_VERSION(5, 0), .version = CCP_VERSION(5, 0),
.setup = ccp5other_config, .setup = ccp5other_config,
.perform = &ccp5_actions, .perform = &ccp5_actions,

6
drivers/crypto/ccp/ccp-dev.h
View File

@ -639,8 +639,8 @@ struct ccp_vdata {
const unsigned int offset; const unsigned int offset;
}; };
extern struct ccp_vdata ccpv3; extern const struct ccp_vdata ccpv3;
extern struct ccp_vdata ccpv5; extern const struct ccp_vdata ccpv5a;
extern struct ccp_vdata ccpv5other; extern const struct ccp_vdata ccpv5b;
#endif #endif

4
drivers/crypto/ccp/ccp-pci.c
View File

@ -325,8 +325,8 @@ static int ccp_pci_resume(struct pci_dev *pdev)
static const struct pci_device_id ccp_pci_table[] = { static const struct pci_device_id ccp_pci_table[] = {
{ PCI_VDEVICE(AMD, 0x1537), (kernel_ulong_t)&ccpv3 }, { PCI_VDEVICE(AMD, 0x1537), (kernel_ulong_t)&ccpv3 },
{ PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&ccpv5 }, { PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&ccpv5a },
{ PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&ccpv5other }, { PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&ccpv5b },
/* Last entry must be zero */ /* Last entry must be zero */
{ 0, } { 0, }
}; };