diff options
author | Aaron Sierra <asierra@xes-inc.com> | 2014-04-03 15:48:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-16 17:08:37 -0400 |
commit | 177581faf2a5aa71898d223bc47dbc882eeb1488 (patch) | |
tree | 9a7042fb952de8a2513d77c649a1ecc5daeeb034 /drivers/vme/bridges | |
parent | 226572b110ab6083cb8c1d6afb191166b4178179 (diff) |
vme_tsi148: Utilize to_pci_dev() macro
Save some characters by using to_pci_dev() instead of container_of().
Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/vme/bridges')
-rw-r--r-- | drivers/vme/bridges/vme_tsi148.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c index e64e4208de2b..61e706c0e00c 100644 --- a/drivers/vme/bridges/vme_tsi148.c +++ b/drivers/vme/bridges/vme_tsi148.c | |||
@@ -320,7 +320,7 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge) | |||
320 | struct pci_dev *pdev; | 320 | struct pci_dev *pdev; |
321 | struct tsi148_driver *bridge; | 321 | struct tsi148_driver *bridge; |
322 | 322 | ||
323 | pdev = container_of(tsi148_bridge->parent, struct pci_dev, dev); | 323 | pdev = to_pci_dev(tsi148_bridge->parent); |
324 | 324 | ||
325 | bridge = tsi148_bridge->driver_priv; | 325 | bridge = tsi148_bridge->driver_priv; |
326 | 326 | ||
@@ -433,9 +433,7 @@ static void tsi148_irq_set(struct vme_bridge *tsi148_bridge, int level, | |||
433 | iowrite32be(tmp, bridge->base + TSI148_LCSR_INTEO); | 433 | iowrite32be(tmp, bridge->base + TSI148_LCSR_INTEO); |
434 | 434 | ||
435 | if (sync != 0) { | 435 | if (sync != 0) { |
436 | pdev = container_of(tsi148_bridge->parent, | 436 | pdev = to_pci_dev(tsi148_bridge->parent); |
437 | struct pci_dev, dev); | ||
438 | |||
439 | synchronize_irq(pdev->irq); | 437 | synchronize_irq(pdev->irq); |
440 | } | 438 | } |
441 | } else { | 439 | } else { |
@@ -814,7 +812,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, | |||
814 | 812 | ||
815 | tsi148_bridge = image->parent; | 813 | tsi148_bridge = image->parent; |
816 | 814 | ||
817 | pdev = container_of(tsi148_bridge->parent, struct pci_dev, dev); | 815 | pdev = to_pci_dev(tsi148_bridge->parent); |
818 | 816 | ||
819 | existing_size = (unsigned long long)(image->bus_resource.end - | 817 | existing_size = (unsigned long long)(image->bus_resource.end - |
820 | image->bus_resource.start); | 818 | image->bus_resource.start); |
@@ -917,7 +915,7 @@ static int tsi148_master_set(struct vme_master_resource *image, int enabled, | |||
917 | 915 | ||
918 | bridge = tsi148_bridge->driver_priv; | 916 | bridge = tsi148_bridge->driver_priv; |
919 | 917 | ||
920 | pdev = container_of(tsi148_bridge->parent, struct pci_dev, dev); | 918 | pdev = to_pci_dev(tsi148_bridge->parent); |
921 | 919 | ||
922 | /* Verify input data */ | 920 | /* Verify input data */ |
923 | if (vme_base & 0xFFFF) { | 921 | if (vme_base & 0xFFFF) { |
@@ -2238,7 +2236,7 @@ static void *tsi148_alloc_consistent(struct device *parent, size_t size, | |||
2238 | struct pci_dev *pdev; | 2236 | struct pci_dev *pdev; |
2239 | 2237 | ||
2240 | /* Find pci_dev container of dev */ | 2238 | /* Find pci_dev container of dev */ |
2241 | pdev = container_of(parent, struct pci_dev, dev); | 2239 | pdev = to_pci_dev(parent); |
2242 | 2240 | ||
2243 | return pci_alloc_consistent(pdev, size, dma); | 2241 | return pci_alloc_consistent(pdev, size, dma); |
2244 | } | 2242 | } |
@@ -2249,7 +2247,7 @@ static void tsi148_free_consistent(struct device *parent, size_t size, | |||
2249 | struct pci_dev *pdev; | 2247 | struct pci_dev *pdev; |
2250 | 2248 | ||
2251 | /* Find pci_dev container of dev */ | 2249 | /* Find pci_dev container of dev */ |
2252 | pdev = container_of(parent, struct pci_dev, dev); | 2250 | pdev = to_pci_dev(parent); |
2253 | 2251 | ||
2254 | pci_free_consistent(pdev, size, vaddr, dma); | 2252 | pci_free_consistent(pdev, size, vaddr, dma); |
2255 | } | 2253 | } |