]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
vme: vme_ca91cx42.c: use to_pci_dev()
authorGeliang Tang <geliangtang@163.com>
Sun, 27 Dec 2015 10:46:04 +0000 (18:46 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Feb 2016 07:17:59 +0000 (23:17 -0800)
Use to_pci_dev() instead of open-coding it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Acked-by: Martyn Welch <martyn@welchs.me.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/vme/bridges/vme_ca91cx42.c

index b79a74a98a23573763ed6023d068eab184ef9611..5fbeab38889ebd29843c3c0e32e7d7a36f937d76 100644 (file)
@@ -202,7 +202,7 @@ static int ca91cx42_irq_init(struct vme_bridge *ca91cx42_bridge)
        bridge = ca91cx42_bridge->driver_priv;
 
        /* Need pdev */
-       pdev = container_of(ca91cx42_bridge->parent, struct pci_dev, dev);
+       pdev = to_pci_dev(ca91cx42_bridge->parent);
 
        INIT_LIST_HEAD(&ca91cx42_bridge->vme_error_handlers);
 
@@ -293,8 +293,7 @@ static void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level,
        iowrite32(tmp, bridge->base + LINT_EN);
 
        if ((state == 0) && (sync != 0)) {
-               pdev = container_of(ca91cx42_bridge->parent, struct pci_dev,
-                       dev);
+               pdev = to_pci_dev(ca91cx42_bridge->parent);
 
                synchronize_irq(pdev->irq);
        }
@@ -518,7 +517,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
                dev_err(ca91cx42_bridge->parent, "Dev entry NULL\n");
                return -EINVAL;
        }
-       pdev = container_of(ca91cx42_bridge->parent, struct pci_dev, dev);
+       pdev = to_pci_dev(ca91cx42_bridge->parent);
 
        existing_size = (unsigned long long)(image->bus_resource.end -
                image->bus_resource.start);
@@ -1519,7 +1518,7 @@ static void *ca91cx42_alloc_consistent(struct device *parent, size_t size,
        struct pci_dev *pdev;
 
        /* Find pci_dev container of dev */
-       pdev = container_of(parent, struct pci_dev, dev);
+       pdev = to_pci_dev(parent);
 
        return pci_alloc_consistent(pdev, size, dma);
 }
@@ -1530,7 +1529,7 @@ static void ca91cx42_free_consistent(struct device *parent, size_t size,
        struct pci_dev *pdev;
 
        /* Find pci_dev container of dev */
-       pdev = container_of(parent, struct pci_dev, dev);
+       pdev = to_pci_dev(parent);
 
        pci_free_consistent(pdev, size, vaddr, dma);
 }