Merge branch 'topic/user-access-begin' into next

[linux.git] / drivers / misc / pci_endpoint_test.c

diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
index 6e208a060a585d2926a97fad210f5acac7baa24d..a5e317073d95d1718af18ebb09e5d5194004943b 100644 (file)
--- a/drivers/misc/pci_endpoint_test.c
+++ b/drivers/misc/pci_endpoint_test.c
@@ -94,7 +94,7 @@ enum pci_barno {
 struct pci_endpoint_test {
        struct pci_dev  *pdev;
        void __iomem    *base;
-       void __iomem    *bar[6];
+       void __iomem    *bar[PCI_STD_NUM_BARS];
        struct completion irq_raised;
        int             last_irq;
        int             num_irqs;
@@ -687,7 +687,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
        if (!pci_endpoint_test_request_irq(test))
                goto err_disable_irq;
 
-       for (bar = BAR_0; bar <= BAR_5; bar++) {
+       for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
                if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
                        base = pci_ioremap_bar(pdev, bar);
                        if (!base) {
@@ -740,7 +740,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
        ida_simple_remove(&pci_endpoint_test_ida, id);
 
 err_iounmap:
-       for (bar = BAR_0; bar <= BAR_5; bar++) {
+       for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
                if (test->bar[bar])
                        pci_iounmap(pdev, test->bar[bar]);
        }
@@ -771,7 +771,7 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
        misc_deregister(&test->miscdev);
        kfree(misc_device->name);
        ida_simple_remove(&pci_endpoint_test_ida, id);
-       for (bar = BAR_0; bar <= BAR_5; bar++) {
+       for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
                if (test->bar[bar])
                        pci_iounmap(pdev, test->bar[bar]);
        }