Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Gary R Hook and committed by
Herbert Xu
9ddb9dc6 8df4f27c

+12 -9
+1 -1
drivers/crypto/ccp/ccp-dev-v3.c
··· 566 566 .irqhandler = ccp_irq_handler, 567 567 }; 568 568 569 - struct ccp_vdata ccpv3 = { 569 + const struct ccp_vdata ccpv3 = { 570 570 .version = CCP_VERSION(3, 0), 571 571 .setup = NULL, 572 572 .perform = &ccp3_actions,
+6 -3
drivers/crypto/ccp/ccp-dev-v5.c
··· 835 835 /* Register the DMA engine support */ 836 836 ret = ccp_dmaengine_register(ccp); 837 837 if (ret) 838 - goto e_kthread; 838 + goto e_hwrng; 839 839 840 840 return 0; 841 + 842 + e_hwrng: 843 + ccp_unregister_rng(ccp); 841 844 842 845 e_kthread: 843 846 for (i = 0; i < ccp->cmd_q_count; i++) ··· 997 994 .irqhandler = ccp5_irq_handler, 998 995 }; 999 996 1000 - struct ccp_vdata ccpv5 = { 997 + const struct ccp_vdata ccpv5a = { 1001 998 .version = CCP_VERSION(5, 0), 1002 999 .setup = ccp5_config, 1003 1000 .perform = &ccp5_actions, ··· 1005 1002 .offset = 0x0, 1006 1003 }; 1007 1004 1008 - struct ccp_vdata ccpv5other = { 1005 + const struct ccp_vdata ccpv5b = { 1009 1006 .version = CCP_VERSION(5, 0), 1010 1007 .setup = ccp5other_config, 1011 1008 .perform = &ccp5_actions,
+3 -3
drivers/crypto/ccp/ccp-dev.h
··· 639 639 const unsigned int offset; 640 640 }; 641 641 642 - extern struct ccp_vdata ccpv3; 643 - extern struct ccp_vdata ccpv5; 644 - extern struct ccp_vdata ccpv5other; 642 + extern const struct ccp_vdata ccpv3; 643 + extern const struct ccp_vdata ccpv5a; 644 + extern const struct ccp_vdata ccpv5b; 645 645 646 646 #endif
+2 -2
drivers/crypto/ccp/ccp-pci.c
··· 325 325 326 326 static const struct pci_device_id ccp_pci_table[] = { 327 327 { PCI_VDEVICE(AMD, 0x1537), (kernel_ulong_t)&ccpv3 }, 328 - { PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&ccpv5 }, 329 - { PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&ccpv5other }, 328 + { PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&ccpv5a }, 329 + { PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&ccpv5b }, 330 330 /* Last entry must be zero */ 331 331 { 0, } 332 332 };