diff options
| author | Joe Perches <joe@perches.com> | 2014-10-31 13:50:46 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2014-11-11 15:51:42 -0500 |
| commit | f47436734dc89ece62654d4db8d08163a89dd7ca (patch) | |
| tree | 1977a1e352588c026c87cc1fc34c93fabba6f2b7 /arch/tile/kernel/pci.c | |
| parent | ebd25caf7d511312d1a9724ab5752e9e661dfe60 (diff) | |
tile: Use the more common pr_warn instead of pr_warning
And other message logging neatening.
Other miscellanea:
o coalesce formats
o realign arguments
o standardize a couple of macros
o use __func__ instead of embedding the function name
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel/pci.c')
| -rw-r--r-- | arch/tile/kernel/pci.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 1f80a88c75a6..f70c7892fa25 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c | |||
| @@ -178,8 +178,8 @@ int __init tile_pci_init(void) | |||
| 178 | continue; | 178 | continue; |
| 179 | hv_cfg_fd1 = tile_pcie_open(i, 1); | 179 | hv_cfg_fd1 = tile_pcie_open(i, 1); |
| 180 | if (hv_cfg_fd1 < 0) { | 180 | if (hv_cfg_fd1 < 0) { |
| 181 | pr_err("PCI: Couldn't open config fd to HV " | 181 | pr_err("PCI: Couldn't open config fd to HV for controller %d\n", |
| 182 | "for controller %d\n", i); | 182 | i); |
| 183 | goto err_cont; | 183 | goto err_cont; |
| 184 | } | 184 | } |
| 185 | 185 | ||
| @@ -423,8 +423,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
| 423 | for (i = 0; i < 6; i++) { | 423 | for (i = 0; i < 6; i++) { |
| 424 | r = &dev->resource[i]; | 424 | r = &dev->resource[i]; |
| 425 | if (r->flags & IORESOURCE_UNSET) { | 425 | if (r->flags & IORESOURCE_UNSET) { |
| 426 | pr_err("PCI: Device %s not available " | 426 | pr_err("PCI: Device %s not available because of resource collisions\n", |
| 427 | "because of resource collisions\n", | ||
| 428 | pci_name(dev)); | 427 | pci_name(dev)); |
| 429 | return -EINVAL; | 428 | return -EINVAL; |
| 430 | } | 429 | } |