aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-05-28 19:31:26 -0400
committerBjorn Helgaas <bhelgaas@google.com>2016-06-25 08:44:24 -0400
commitda6163ad3aae627d0b12ae58300c5d02d8ee613e (patch)
treee923210ad063aa2c10e1bddb2566e15d0cc4c976
parent2fbb353041891ce8527667ca956d9c53222dec01 (diff)
PCI: versatile: Simplify host bridge window iteration
The switch is the only statement in the resource_list_for_each_entry() loop, so remove unnecessary "continue" statements in the switch. Simplify checking for the required non-prefetchable memory aperture. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/host/pci-versatile.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c
index 273edaca8f49..f234405770ab 100644
--- a/drivers/pci/host/pci-versatile.c
+++ b/drivers/pci/host/pci-versatile.c
@@ -90,11 +90,9 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
90 switch (resource_type(res)) { 90 switch (resource_type(res)) {
91 case IORESOURCE_IO: 91 case IORESOURCE_IO:
92 err = pci_remap_iospace(res, iobase); 92 err = pci_remap_iospace(res, iobase);
93 if (err) { 93 if (err)
94 dev_warn(dev, "error %d: failed to map resource %pR\n", 94 dev_warn(dev, "error %d: failed to map resource %pR\n",
95 err, res); 95 err, res);
96 continue;
97 }
98 break; 96 break;
99 case IORESOURCE_MEM: 97 case IORESOURCE_MEM:
100 res_valid |= !(res->flags & IORESOURCE_PREFETCH); 98 res_valid |= !(res->flags & IORESOURCE_PREFETCH);
@@ -104,19 +102,14 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
104 mem++; 102 mem++;
105 103
106 break; 104 break;
107 case IORESOURCE_BUS:
108 default:
109 continue;
110 } 105 }
111 } 106 }
112 107
113 if (!res_valid) { 108 if (res_valid)
114 dev_err(dev, "non-prefetchable memory resource required\n"); 109 return 0;
115 err = -EINVAL;
116 goto out_release_res;
117 }
118 110
119 return 0; 111 dev_err(dev, "non-prefetchable memory resource required\n");
112 err = -EINVAL;
120 113
121out_release_res: 114out_release_res:
122 pci_free_resource_list(res); 115 pci_free_resource_list(res);