1 files changed, 24 insertions, 25 deletions

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index b1ad466199ad..3cce29a069e6 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *      drivers/pci/setup-bus.c
  *
@@ -67,10 +68,8 @@ static int add_to_list(struct list_head *head,
         struct pci_dev_resource *tmp;
 
         tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
-        if (!tmp) {
-                pr_warn("add_to_list: kmalloc() failed!\n");
+        if (!tmp)
                 return -ENOMEM;
-        }
 
         tmp->res = res;
         tmp->dev = dev;
@@ -152,7 +151,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
 
                 r_align = pci_resource_alignment(dev, r);
                 if (!r_align) {
-                        dev_warn(&dev->dev, "BAR %d: %pR has bogus alignment\n",
+                        pci_warn(dev, "BAR %d: %pR has bogus alignment\n",
                                  i, r);
                         continue;
                 }
@@ -260,7 +259,7 @@ static void reassign_resources_sorted(struct list_head *realloc_head,
                                  (IORESOURCE_STARTALIGN|IORESOURCE_SIZEALIGN);
                         if (pci_reassign_resource(add_res->dev, idx,
                                                   add_size, align))
-                                dev_printk(KERN_DEBUG, &add_res->dev->dev,
+                                pci_printk(KERN_DEBUG, add_res->dev,
                                            "failed to add %llx res[%d]=%pR\n",
                                            (unsigned long long)add_size,
                                            idx, res);
@@ -519,7 +518,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
         struct resource *res;
         struct pci_bus_region region;
 
-        dev_info(&bridge->dev, "CardBus bridge to %pR\n",
+        pci_info(bridge, "CardBus bridge to %pR\n",
                  &bus->busn_res);
 
         res = bus->resource[0];
@@ -529,7 +528,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
                  * The IO resource is allocated a range twice as large as it
                  * would normally need.  This allows us to set both IO regs.
                  */
-                dev_info(&bridge->dev, "  bridge window %pR\n", res);
+                pci_info(bridge, "  bridge window %pR\n", res);
                 pci_write_config_dword(bridge, PCI_CB_IO_BASE_0,
                                         region.start);
                 pci_write_config_dword(bridge, PCI_CB_IO_LIMIT_0,
@@ -539,7 +538,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
         res = bus->resource[1];
         pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_IO) {
-                dev_info(&bridge->dev, "  bridge window %pR\n", res);
+                pci_info(bridge, "  bridge window %pR\n", res);
                 pci_write_config_dword(bridge, PCI_CB_IO_BASE_1,
                                         region.start);
                 pci_write_config_dword(bridge, PCI_CB_IO_LIMIT_1,
@@ -549,7 +548,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
         res = bus->resource[2];
         pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_MEM) {
-                dev_info(&bridge->dev, "  bridge window %pR\n", res);
+                pci_info(bridge, "  bridge window %pR\n", res);
                 pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_0,
                                         region.start);
                 pci_write_config_dword(bridge, PCI_CB_MEMORY_LIMIT_0,
@@ -559,7 +558,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
         res = bus->resource[3];
         pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_MEM) {
-                dev_info(&bridge->dev, "  bridge window %pR\n", res);
+                pci_info(bridge, "  bridge window %pR\n", res);
                 pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_1,
                                         region.start);
                 pci_write_config_dword(bridge, PCI_CB_MEMORY_LIMIT_1,
@@ -602,7 +601,7 @@ static void pci_setup_bridge_io(struct pci_dev *bridge)
                 l = ((u16) io_limit_lo << 8) | io_base_lo;
                 /* Set up upper 16 bits of I/O base/limit. */
                 io_upper16 = (region.end & 0xffff0000) | (region.start >> 16);
-                dev_info(&bridge->dev, "  bridge window %pR\n", res);
+                pci_info(bridge, "  bridge window %pR\n", res);
         } else {
                 /* Clear upper 16 bits of I/O base/limit. */
                 io_upper16 = 0;
@@ -628,7 +627,7 @@ static void pci_setup_bridge_mmio(struct pci_dev *bridge)
         if (res->flags & IORESOURCE_MEM) {
                 l = (region.start >> 16) & 0xfff0;
                 l |= region.end & 0xfff00000;
-                dev_info(&bridge->dev, "  bridge window %pR\n", res);
+                pci_info(bridge, "  bridge window %pR\n", res);
         } else {
                 l = 0x0000fff0;
         }
@@ -657,7 +656,7 @@ static void pci_setup_bridge_mmio_pref(struct pci_dev *bridge)
                         bu = upper_32_bits(region.start);
                         lu = upper_32_bits(region.end);
                 }
-                dev_info(&bridge->dev, "  bridge window %pR\n", res);
+                pci_info(bridge, "  bridge window %pR\n", res);
         } else {
                 l = 0x0000fff0;
         }
@@ -672,7 +671,7 @@ static void __pci_setup_bridge(struct pci_bus *bus, unsigned long type)
 {
         struct pci_dev *bridge = bus->self;
 
-        dev_info(&bridge->dev, "PCI bridge to %pR\n",
+        pci_info(bridge, "PCI bridge to %pR\n",
                  &bus->busn_res);
 
         if (type & IORESOURCE_IO)
@@ -944,7 +943,7 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
                         resource_size(b_res), min_align);
         if (!size0 && !size1) {
                 if (b_res->start || b_res->end)
-                        dev_info(&bus->self->dev, "disabling bridge window %pR to %pR (unused)\n",
+                        pci_info(bus->self, "disabling bridge window %pR to %pR (unused)\n",
                                  b_res, &bus->busn_res);
                 b_res->flags = 0;
                 return;
@@ -956,7 +955,7 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
         if (size1 > size0 && realloc_head) {
                 add_to_list(realloc_head, bus->self, b_res, size1-size0,
                             min_align);
-                dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window %pR to %pR add_size %llx\n",
+                pci_printk(KERN_DEBUG, bus->self, "bridge window %pR to %pR add_size %llx\n",
                            b_res, &bus->busn_res,
                            (unsigned long long)size1-size0);
         }
@@ -1061,7 +1060,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
                         if (order < 0)
                                 order = 0;
                         if (order >= ARRAY_SIZE(aligns)) {
-                                dev_warn(&dev->dev, "disabling BAR %d: %pR (bad alignment %#llx)\n",
+                                pci_warn(dev, "disabling BAR %d: %pR (bad alignment %#llx)\n",
                                          i, r, (unsigned long long) align);
                                 r->flags = 0;
                                 continue;
@@ -1093,7 +1092,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
                                 resource_size(b_res), add_align);
         if (!size0 && !size1) {
                 if (b_res->start || b_res->end)
-                        dev_info(&bus->self->dev, "disabling bridge window %pR to %pR (unused)\n",
+                        pci_info(bus->self, "disabling bridge window %pR to %pR (unused)\n",
                                  b_res, &bus->busn_res);
                 b_res->flags = 0;
                 return 0;
@@ -1103,7 +1102,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
         b_res->flags |= IORESOURCE_STARTALIGN;
         if (size1 > size0 && realloc_head) {
                 add_to_list(realloc_head, bus->self, b_res, size1-size0, add_align);
-                dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window %pR to %pR add_size %llx add_align %llx\n",
+                pci_printk(KERN_DEBUG, bus->self, "bridge window %pR to %pR add_size %llx add_align %llx\n",
                            b_res, &bus->busn_res,
                            (unsigned long long) (size1 - size0),
                            (unsigned long long) add_align);
@@ -1407,7 +1406,7 @@ void __pci_bus_assign_resources(const struct pci_bus *bus,
                         break;
 
                 default:
-                        dev_info(&dev->dev, "not setting up bridge for bus %04x:%02x\n",
+                        pci_info(dev, "not setting up bridge for bus %04x:%02x\n",
                                  pci_domain_nr(b), b->number);
                         break;
                 }
@@ -1513,7 +1512,7 @@ static void __pci_bridge_assign_resources(const struct pci_dev *bridge,
                 break;
 
         default:
-                dev_info(&bridge->dev, "not setting up bridge for bus %04x:%02x\n",
+                pci_info(bridge, "not setting up bridge for bus %04x:%02x\n",
                          pci_domain_nr(b), b->number);
                 break;
         }
@@ -1571,7 +1570,7 @@ static void pci_bridge_release_resources(struct pci_bus *bus,
         release_child_resources(r);
         if (!release_resource(r)) {
                 type = old_flags = r->flags & PCI_RES_TYPE_MASK;
-                dev_printk(KERN_DEBUG, &dev->dev, "resource %d %pR released\n",
+                pci_printk(KERN_DEBUG, dev, "resource %d %pR released\n",
                                         PCI_BRIDGE_RESOURCES + idx, r);
                 /* keep the old size */
                 r->end = resource_size(r) - 1;
@@ -1874,7 +1873,7 @@ static void extend_bridge_window(struct pci_dev *bridge, struct resource *res,
                 return;
 
         dev_res->add_size = available - resource_size(res);
-        dev_dbg(&bridge->dev, "bridge window %pR extended by %pa\n", res,
+        pci_dbg(bridge, "bridge window %pR extended by %pa\n", res,
                 &dev_res->add_size);
 }
 
@@ -2085,7 +2084,7 @@ again:
 enable_all:
         retval = pci_reenable_device(bridge);
         if (retval)
-                dev_err(&bridge->dev, "Error reenabling bridge (%d)\n", retval);
+                pci_err(bridge, "Error reenabling bridge (%d)\n", retval);
         pci_set_master(bridge);
 }
 EXPORT_SYMBOL_GPL(pci_assign_unassigned_bridge_resources);
@@ -2119,7 +2118,7 @@ int pci_reassign_bridge_resources(struct pci_dev *bridge, unsigned long type)
                         if (ret)
                                 goto cleanup;
 
-                        dev_info(&bridge->dev, "BAR %d: releasing %pR\n",
+                        pci_info(bridge, "BAR %d: releasing %pR\n",
                                  i, res);
 
                         if (res->parent)