diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2020-06-17 16:36:38 +0200 |
---|---|---|
committer | Rich Felker <dalias@libc.org> | 2020-08-14 22:05:10 -0400 |
commit | 601bf18b6630d37bde945fc890a995650f53e2c9 (patch) | |
tree | 5e39912760f52fa0f2dba5a4505fee7363513d53 /arch/sh/drivers/pci/pci.c | |
parent | f88c6a26ddd6c1b914c0c2536cff89b183a89a28 (diff) | |
download | linux-601bf18b6630d37bde945fc890a995650f53e2c9.tar.gz linux-601bf18b6630d37bde945fc890a995650f53e2c9.tar.bz2 linux-601bf18b6630d37bde945fc890a995650f53e2c9.zip |
sh: pci: Modernize printing of kernel messages
- Convert from printk() to pr_*(),
- Add missing continuations,
- Join broken messages.
Note that printk(KERN_DEBUG ...) is retained, to preserve behavior
(pr_debug() is a dummy if DEBUG is not defined).
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Rich Felker <dalias@libc.org>
Diffstat (limited to 'arch/sh/drivers/pci/pci.c')
-rw-r--r-- | arch/sh/drivers/pci/pci.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index c7784e156964..6ab0b7377f66 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -120,8 +120,7 @@ int register_pci_controller(struct pci_channel *hose) * Do not panic here but later - this might happen before console init. */ if (!hose->io_map_base) { - printk(KERN_WARNING - "registering PCI controller with io_map_base unset\n"); + pr_warn("registering PCI controller with io_map_base unset\n"); } /* @@ -145,7 +144,7 @@ out: for (--i; i >= 0; i--) release_resource(&hose->resources[i]); - printk(KERN_WARNING "Skipping PCI bus scan due to resource conflict\n"); + pr_warn("Skipping PCI bus scan due to resource conflict\n"); return -1; } @@ -213,8 +212,8 @@ pcibios_bus_report_status_early(struct pci_channel *hose, pci_devfn, PCI_STATUS, status & status_mask); if (warn) - printk("(%02x:%02x: %04X) ", current_bus, - pci_devfn, status); + pr_cont("(%02x:%02x: %04X) ", current_bus, pci_devfn, + status); } } @@ -249,7 +248,7 @@ pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask, pci_write_config_word(dev, PCI_STATUS, status & status_mask); if (warn) - printk("(%s: %04X) ", pci_name(dev), status); + pr_cont("(%s: %04X) ", pci_name(dev), status); } list_for_each_entry(dev, &bus->devices, bus_list) |