crypto: ccp - use to_pci_dev and to_platform_device

Orabug: 26644685

Use to_pci_dev() and to_platform_device() instead of open-coding.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit c6c59bf2c0d60e67449190a8a95628ecd04b3969)
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/crypto/ccp/ccp-pci.c b/drivers/crypto/ccp/ccp-pci.c
index 6ade02f04f91cc7fdaafcdfa2c0b8bbe97e198f3..7690467c42f801e19c104ff5235de3ffa4b0f96f 100644 (file)
--- a/drivers/crypto/ccp/ccp-pci.c
+++ b/drivers/crypto/ccp/ccp-pci.c
@@ -44,7 +44,7 @@ static int ccp_get_msix_irqs(struct ccp_device *ccp)
 {
        struct ccp_pci *ccp_pci = ccp->dev_specific;
        struct device *dev = ccp->dev;
-       struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
+       struct pci_dev *pdev = to_pci_dev(dev);
        struct msix_entry msix_entry[MSIX_VECTORS];
        unsigned int name_len = sizeof(ccp_pci->msix[0].name) - 1;
        int v, ret;
@@ -86,7 +86,7 @@ e_irq:
 static int ccp_get_msi_irq(struct ccp_device *ccp)
 {
        struct device *dev = ccp->dev;
-       struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
+       struct pci_dev *pdev = to_pci_dev(dev);
        int ret;
 
        ret = pci_enable_msi(pdev);
@@ -133,7 +133,7 @@ static void ccp_free_irqs(struct ccp_device *ccp)
 {
        struct ccp_pci *ccp_pci = ccp->dev_specific;
        struct device *dev = ccp->dev;
-       struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
+       struct pci_dev *pdev = to_pci_dev(dev);
 
        if (ccp_pci->msix_count) {
                while (ccp_pci->msix_count--)
@@ -149,7 +149,7 @@ static void ccp_free_irqs(struct ccp_device *ccp)
 static int ccp_find_mmio_area(struct ccp_device *ccp)
 {
        struct device *dev = ccp->dev;
-       struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
+       struct pci_dev *pdev = to_pci_dev(dev);
        resource_size_t io_len;
        unsigned long io_flags;
 

diff --git a/drivers/crypto/ccp/ccp-platform.c b/drivers/crypto/ccp/ccp-platform.c
index 20623641b82c6fd5e1308838e25806a96a68dece..2b7ef27a1e0a9f204ec418166016c236dd4a5b39 100644 (file)
--- a/drivers/crypto/ccp/ccp-platform.c
+++ b/drivers/crypto/ccp/ccp-platform.c
@@ -36,8 +36,7 @@ struct ccp_platform {
 static int ccp_get_irq(struct ccp_device *ccp)
 {
        struct device *dev = ccp->dev;
-       struct platform_device *pdev = container_of(dev,
-                                       struct platform_device, dev);
+       struct platform_device *pdev = to_platform_device(dev);
        int ret;
 
        ret = platform_get_irq(pdev, 0);
@@ -79,8 +78,7 @@ static void ccp_free_irqs(struct ccp_device *ccp)
 static struct resource *ccp_find_mmio_area(struct ccp_device *ccp)
 {
        struct device *dev = ccp->dev;
-       struct platform_device *pdev = container_of(dev,
-                                       struct platform_device, dev);
+       struct platform_device *pdev = to_platform_device(dev);
        struct resource *ior;
 
        ior = platform_get_resource(pdev, IORESOURCE_MEM, 0);