diff options
author | Geliang Tang <geliangtang@163.com> | 2015-12-27 05:46:04 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-08 02:17:59 -0500 |
commit | 445f82492f2256b9a7c09292b458e152e7fae7f1 (patch) | |
tree | 1c41cade1565947a21f089431dcb43d686b0e27c /drivers/vme/bridges | |
parent | c37ff3fbe06f44e8ec3f8077b3a3c468635a8868 (diff) |
vme: vme_ca91cx42.c: use to_pci_dev()
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>
Diffstat (limited to 'drivers/vme/bridges')
-rw-r--r-- | drivers/vme/bridges/vme_ca91cx42.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c index b79a74a98a23..5fbeab38889e 100644 --- a/drivers/vme/bridges/vme_ca91cx42.c +++ b/drivers/vme/bridges/vme_ca91cx42.c | |||
@@ -202,7 +202,7 @@ static int ca91cx42_irq_init(struct vme_bridge *ca91cx42_bridge) | |||
202 | bridge = ca91cx42_bridge->driver_priv; | 202 | bridge = ca91cx42_bridge->driver_priv; |
203 | 203 | ||
204 | /* Need pdev */ | 204 | /* Need pdev */ |
205 | pdev = container_of(ca91cx42_bridge->parent, struct pci_dev, dev); | 205 | pdev = to_pci_dev(ca91cx42_bridge->parent); |
206 | 206 | ||
207 | INIT_LIST_HEAD(&ca91cx42_bridge->vme_error_handlers); | 207 | INIT_LIST_HEAD(&ca91cx42_bridge->vme_error_handlers); |
208 | 208 | ||
@@ -293,8 +293,7 @@ static void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level, | |||
293 | iowrite32(tmp, bridge->base + LINT_EN); | 293 | iowrite32(tmp, bridge->base + LINT_EN); |
294 | 294 | ||
295 | if ((state == 0) && (sync != 0)) { | 295 | if ((state == 0) && (sync != 0)) { |
296 | pdev = container_of(ca91cx42_bridge->parent, struct pci_dev, | 296 | pdev = to_pci_dev(ca91cx42_bridge->parent); |
297 | dev); | ||
298 | 297 | ||
299 | synchronize_irq(pdev->irq); | 298 | synchronize_irq(pdev->irq); |
300 | } | 299 | } |
@@ -518,7 +517,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, | |||
518 | dev_err(ca91cx42_bridge->parent, "Dev entry NULL\n"); | 517 | dev_err(ca91cx42_bridge->parent, "Dev entry NULL\n"); |
519 | return -EINVAL; | 518 | return -EINVAL; |
520 | } | 519 | } |
521 | pdev = container_of(ca91cx42_bridge->parent, struct pci_dev, dev); | 520 | pdev = to_pci_dev(ca91cx42_bridge->parent); |
522 | 521 | ||
523 | existing_size = (unsigned long long)(image->bus_resource.end - | 522 | existing_size = (unsigned long long)(image->bus_resource.end - |
524 | image->bus_resource.start); | 523 | image->bus_resource.start); |
@@ -1519,7 +1518,7 @@ static void *ca91cx42_alloc_consistent(struct device *parent, size_t size, | |||
1519 | struct pci_dev *pdev; | 1518 | struct pci_dev *pdev; |
1520 | 1519 | ||
1521 | /* Find pci_dev container of dev */ | 1520 | /* Find pci_dev container of dev */ |
1522 | pdev = container_of(parent, struct pci_dev, dev); | 1521 | pdev = to_pci_dev(parent); |
1523 | 1522 | ||
1524 | return pci_alloc_consistent(pdev, size, dma); | 1523 | return pci_alloc_consistent(pdev, size, dma); |
1525 | } | 1524 | } |
@@ -1530,7 +1529,7 @@ static void ca91cx42_free_consistent(struct device *parent, size_t size, | |||
1530 | struct pci_dev *pdev; | 1529 | struct pci_dev *pdev; |
1531 | 1530 | ||
1532 | /* Find pci_dev container of dev */ | 1531 | /* Find pci_dev container of dev */ |
1533 | pdev = container_of(parent, struct pci_dev, dev); | 1532 | pdev = to_pci_dev(parent); |
1534 | 1533 | ||
1535 | pci_free_consistent(pdev, size, vaddr, dma); | 1534 | pci_free_consistent(pdev, size, vaddr, dma); |
1536 | } | 1535 | } |