Skip to content

Commit da07881

Browse files
ij-intelbjorn-helgaas
authored andcommitted
PCI: Rename resource variable from r to res
Resource is going to be passed in as argument aften an upcoming change. Rename the struct resource variable from "r" to "res" to avoid using one letter variable name in a function argument. This rename is made separately to reduce churn in the upcoming change. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Link: https://patch.msgid.link/20250829131113.36754-18-ilpo.jarvinen@linux.intel.com
1 parent ebe091a commit da07881

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/pci/setup-bus.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,32 +1241,32 @@ static bool pbus_upstream_space_available(struct pci_bus *bus, unsigned long mas
12411241
.align = align,
12421242
};
12431243
struct pci_bus *downstream = bus;
1244-
struct resource *r;
1244+
struct resource *res;
12451245

12461246
while ((bus = bus->parent)) {
12471247
if (pci_is_root_bus(bus))
12481248
break;
12491249

1250-
pci_bus_for_each_resource(bus, r) {
1251-
if (!r || !r->parent || (r->flags & mask) != type)
1250+
pci_bus_for_each_resource(bus, res) {
1251+
if (!res || !res->parent || (res->flags & mask) != type)
12521252
continue;
12531253

1254-
if (resource_size(r) >= size) {
1254+
if (resource_size(res) >= size) {
12551255
struct resource gap = {};
12561256

1257-
if (find_resource_space(r, &gap, size, &constraint) == 0) {
1257+
if (find_resource_space(res, &gap, size, &constraint) == 0) {
12581258
gap.flags = type;
12591259
pci_dbg(bus->self,
12601260
"Assigned bridge window %pR to %pR free space at %pR\n",
1261-
r, &bus->busn_res, &gap);
1261+
res, &bus->busn_res, &gap);
12621262
return true;
12631263
}
12641264
}
12651265

12661266
if (bus->self) {
12671267
pci_info(bus->self,
12681268
"Assigned bridge window %pR to %pR cannot fit 0x%llx required for %s bridging to %pR\n",
1269-
r, &bus->busn_res,
1269+
res, &bus->busn_res,
12701270
(unsigned long long)size,
12711271
pci_name(downstream->self),
12721272
&downstream->busn_res);

0 commit comments

Comments
 (0)