UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: ccp - Convert calls to their devm_ counterparts 

Where applicable, convert calls to their devm_ counterparts, e.g. kzalloc
to devm_kzalloc.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Tom Lendacky 2015-02-03 13:07:23 -06:00 committed by Herbert Xu
parent 261bf07489
commit be03a3a096
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ struct ccp_device *ccp_alloc_struct(struct device *dev)
{ {
struct ccp_device *ccp; struct ccp_device *ccp;
ccp = kzalloc(sizeof(*ccp), GFP_KERNEL); ccp = devm_kzalloc(dev, sizeof(*ccp), GFP_KERNEL);
if (!ccp) if (!ccp)
return NULL; return NULL;
ccp->dev = dev; ccp->dev = dev;

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

@ -174,11 +174,10 @@ static int ccp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (!ccp) if (!ccp)
goto e_err; goto e_err;
ccp_pci = kzalloc(sizeof(*ccp_pci), GFP_KERNEL); ccp_pci = devm_kzalloc(dev, sizeof(*ccp_pci), GFP_KERNEL);
if (!ccp_pci) { if (!ccp_pci)
ret = -ENOMEM; goto e_err;
goto e_free1;
}
ccp->dev_specific = ccp_pci; ccp->dev_specific = ccp_pci;
ccp->get_irq = ccp_get_irqs; ccp->get_irq = ccp_get_irqs;
ccp->free_irq = ccp_free_irqs; ccp->free_irq = ccp_free_irqs;
@ -186,7 +185,7 @@ static int ccp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ret = pci_request_regions(pdev, "ccp"); ret = pci_request_regions(pdev, "ccp");
if (ret) { if (ret) {
dev_err(dev, "pci_request_regions failed (%d)\n", ret); dev_err(dev, "pci_request_regions failed (%d)\n", ret);
goto e_free2; goto e_err;
} }
ret = pci_enable_device(pdev); ret = pci_enable_device(pdev);
@ -239,12 +238,6 @@ e_device:
e_regions: e_regions:
pci_release_regions(pdev); pci_release_regions(pdev);
e_free2:
kfree(ccp_pci);
e_free1:
kfree(ccp);
e_err: e_err:
dev_notice(dev, "initialization failed\n"); dev_notice(dev, "initialization failed\n");
return ret; return ret;
@ -266,8 +259,6 @@ static void ccp_pci_remove(struct pci_dev *pdev)
pci_release_regions(pdev); pci_release_regions(pdev);
kfree(ccp);
dev_notice(dev, "disabled\n"); dev_notice(dev, "disabled\n");
} }

11
drivers/crypto/ccp/ccp-platform.c
View File

@ -103,7 +103,7 @@ static int ccp_platform_probe(struct platform_device *pdev)
ccp->io_map = devm_ioremap_resource(dev, ior); ccp->io_map = devm_ioremap_resource(dev, ior);
if (IS_ERR(ccp->io_map)) { if (IS_ERR(ccp->io_map)) {
ret = PTR_ERR(ccp->io_map); ret = PTR_ERR(ccp->io_map);
goto e_free; goto e_err;
} }
ccp->io_regs = ccp->io_map; ccp->io_regs = ccp->io_map;
@ -112,7 +112,7 @@ static int ccp_platform_probe(struct platform_device *pdev)
ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48)); ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48));
if (ret) { if (ret) {
dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret); dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);
goto e_free; goto e_err;
} }
if (of_property_read_bool(dev->of_node, "dma-coherent")) if (of_property_read_bool(dev->of_node, "dma-coherent"))
@ -124,15 +124,12 @@ static int ccp_platform_probe(struct platform_device *pdev)
ret = ccp_init(ccp); ret = ccp_init(ccp);
if (ret) if (ret)
goto e_free; goto e_err;
dev_notice(dev, "enabled\n"); dev_notice(dev, "enabled\n");
return 0; return 0;
e_free:
kfree(ccp);
e_err: e_err:
dev_notice(dev, "initialization failed\n"); dev_notice(dev, "initialization failed\n");
return ret; return ret;
@ -145,8 +142,6 @@ static int ccp_platform_remove(struct platform_device *pdev)
ccp_destroy(ccp); ccp_destroy(ccp);
kfree(ccp);
dev_notice(dev, "disabled\n"); dev_notice(dev, "disabled\n");
return 0; return 0;