diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-13 18:34:46 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-13 18:34:46 -0500 |
| commit | 192415f4986028db53fb76ebcefecf0d73cb900a (patch) | |
| tree | 3d1a356f4fe65d927d8debf21d03ea49bba153d8 /drivers/pci/pci-acpi.c | |
| parent | f2e94683162565ff02d8d7386fadee175ab55e40 (diff) | |
| parent | 34c6b7105e5a11174f856483cde8ad6e61b7236a (diff) | |
Merge branch 'pci/printk'
* pci/printk:
PCI: Replace dev_printk(KERN_DEBUG) with dev_info(), etc
PCI: Replace printk(KERN_INFO) with pr_info(), etc
PCI: Use dev_printk() when possible
Diffstat (limited to 'drivers/pci/pci-acpi.c')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 03e02dd6c1d9..c5e1a097d7e3 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -139,8 +139,7 @@ static acpi_status decode_type0_hpx_record(union acpi_object *record, hpx0->enable_perr = fields[5].integer.value; break; default: - printk(KERN_WARNING - "%s: Type 0 Revision %d record not supported\n", + pr_warn("%s: Type 0 Revision %d record not supported\n", __func__, revision); return AE_ERROR; } @@ -167,8 +166,7 @@ static acpi_status decode_type1_hpx_record(union acpi_object *record, hpx1->tot_max_split = fields[4].integer.value; break; default: - printk(KERN_WARNING - "%s: Type 1 Revision %d record not supported\n", + pr_warn("%s: Type 1 Revision %d record not supported\n", __func__, revision); return AE_ERROR; } @@ -208,8 +206,7 @@ static acpi_status decode_type2_hpx_record(union acpi_object *record, hpx2->sec_unc_err_mask_or = fields[17].integer.value; break; default: - printk(KERN_WARNING - "%s: Type 2 Revision %d record not supported\n", + pr_warn("%s: Type 2 Revision %d record not supported\n", __func__, revision); return AE_ERROR; } @@ -339,7 +336,7 @@ static acpi_status acpi_run_hpx(struct pci_dev *dev, acpi_handle handle, goto exit; break; default: - printk(KERN_ERR "%s: Type %d record not supported\n", + pr_err("%s: Type %d record not supported\n", __func__, type); status = AE_ERROR; goto exit; |