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

diff --cc drivers/pci/pci-acpi.c
index 03e02dd,3ada026..c5e1a09
--- 1/drivers/pci/pci-acpi.c
--- 2/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@@ -132,15 -132,15 +132,14 @@@ static acpi_status decode_type0_hpx_rec
                for (i = 2; i < 6; i++)
                        if (fields[i].type != ACPI_TYPE_INTEGER)
                                return AE_ERROR;
 -              hpx->t0 = &hpx->type0_data;
 -              hpx->t0->revision        = revision;
 -              hpx->t0->cache_line_size = fields[2].integer.value;
 -              hpx->t0->latency_timer   = fields[3].integer.value;
 -              hpx->t0->enable_serr     = fields[4].integer.value;
 -              hpx->t0->enable_perr     = fields[5].integer.value;
 +              hpx0->revision        = revision;
 +              hpx0->cache_line_size = fields[2].integer.value;
 +              hpx0->latency_timer   = fields[3].integer.value;
 +              hpx0->enable_serr     = fields[4].integer.value;
 +              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;
        }
@@@ -161,14 -161,14 +160,13 @@@ static acpi_status decode_type1_hpx_rec
                for (i = 2; i < 5; i++)
                        if (fields[i].type != ACPI_TYPE_INTEGER)
                                return AE_ERROR;
 -              hpx->t1 = &hpx->type1_data;
 -              hpx->t1->revision      = revision;
 -              hpx->t1->max_mem_read  = fields[2].integer.value;
 -              hpx->t1->avg_max_split = fields[3].integer.value;
 -              hpx->t1->tot_max_split = fields[4].integer.value;
 +              hpx1->revision      = revision;
 +              hpx1->max_mem_read  = fields[2].integer.value;
 +              hpx1->avg_max_split = fields[3].integer.value;
 +              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;
        }
@@@ -189,27 -189,27 +187,26 @@@ static acpi_status decode_type2_hpx_rec
                for (i = 2; i < 18; i++)
                        if (fields[i].type != ACPI_TYPE_INTEGER)
                                return AE_ERROR;
 -              hpx->t2 = &hpx->type2_data;
 -              hpx->t2->revision      = revision;
 -              hpx->t2->unc_err_mask_and      = fields[2].integer.value;
 -              hpx->t2->unc_err_mask_or       = fields[3].integer.value;
 -              hpx->t2->unc_err_sever_and     = fields[4].integer.value;
 -              hpx->t2->unc_err_sever_or      = fields[5].integer.value;
 -              hpx->t2->cor_err_mask_and      = fields[6].integer.value;
 -              hpx->t2->cor_err_mask_or       = fields[7].integer.value;
 -              hpx->t2->adv_err_cap_and       = fields[8].integer.value;
 -              hpx->t2->adv_err_cap_or        = fields[9].integer.value;
 -              hpx->t2->pci_exp_devctl_and    = fields[10].integer.value;
 -              hpx->t2->pci_exp_devctl_or     = fields[11].integer.value;
 -              hpx->t2->pci_exp_lnkctl_and    = fields[12].integer.value;
 -              hpx->t2->pci_exp_lnkctl_or     = fields[13].integer.value;
 -              hpx->t2->sec_unc_err_sever_and = fields[14].integer.value;
 -              hpx->t2->sec_unc_err_sever_or  = fields[15].integer.value;
 -              hpx->t2->sec_unc_err_mask_and  = fields[16].integer.value;
 -              hpx->t2->sec_unc_err_mask_or   = fields[17].integer.value;
 +              hpx2->revision      = revision;
 +              hpx2->unc_err_mask_and      = fields[2].integer.value;
 +              hpx2->unc_err_mask_or       = fields[3].integer.value;
 +              hpx2->unc_err_sever_and     = fields[4].integer.value;
 +              hpx2->unc_err_sever_or      = fields[5].integer.value;
 +              hpx2->cor_err_mask_and      = fields[6].integer.value;
 +              hpx2->cor_err_mask_or       = fields[7].integer.value;
 +              hpx2->adv_err_cap_and       = fields[8].integer.value;
 +              hpx2->adv_err_cap_or        = fields[9].integer.value;
 +              hpx2->pci_exp_devctl_and    = fields[10].integer.value;
 +              hpx2->pci_exp_devctl_or     = fields[11].integer.value;
 +              hpx2->pci_exp_lnkctl_and    = fields[12].integer.value;
 +              hpx2->pci_exp_lnkctl_or     = fields[13].integer.value;
 +              hpx2->sec_unc_err_sever_and = fields[14].integer.value;
 +              hpx2->sec_unc_err_sever_or  = fields[15].integer.value;
 +              hpx2->sec_unc_err_mask_and  = fields[16].integer.value;
 +              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;
        }

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc drivers/pci/xen-pcifront.c
Simple merge