* [PATCH v1] MIPS: PCI: Use dev_printk()
@ 2018-05-22 13:11 Bjorn Helgaas
2018-05-22 13:11 ` [PATCH v1] MIPS: PCI: Use dev_printk() when possible Bjorn Helgaas
2018-05-30 16:50 ` [PATCH v1] MIPS: PCI: Use dev_printk() Bjorn Helgaas
0 siblings, 2 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2018-05-22 13:11 UTC (permalink / raw)
To: linux-pci; +Cc: Ralf Baechle, James Hogan, linux-mips, linux-kernel
Use dev_printk() to follow style of other arches.
I'll merge via the PCI tree unless there are objections.
---
Bjorn Helgaas (1):
MIPS: PCI: Use dev_printk() when possible
arch/mips/pci/pci-legacy.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v1] MIPS: PCI: Use dev_printk() when possible 2018-05-22 13:11 [PATCH v1] MIPS: PCI: Use dev_printk() Bjorn Helgaas @ 2018-05-22 13:11 ` Bjorn Helgaas 2018-05-23 8:14 ` James Hogan 2018-05-30 16:50 ` [PATCH v1] MIPS: PCI: Use dev_printk() Bjorn Helgaas 1 sibling, 1 reply; 5+ messages in thread From: Bjorn Helgaas @ 2018-05-22 13:11 UTC (permalink / raw) To: linux-pci; +Cc: Ralf Baechle, James Hogan, linux-mips, linux-kernel From: Bjorn Helgaas <bhelgaas@google.com> Use the pci_info() and pci_err() wrappers for dev_printk() when possible. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- arch/mips/pci/pci-legacy.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c index 0c65c38e05d6..73643e80f02d 100644 --- a/arch/mips/pci/pci-legacy.c +++ b/arch/mips/pci/pci-legacy.c @@ -263,9 +263,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) (!(r->flags & IORESOURCE_ROM_ENABLE))) continue; if (!r->start && r->end) { - printk(KERN_ERR "PCI: Device %s not available " - "because of resource collisions\n", - pci_name(dev)); + pci_err(dev, "can't enable device: resource collisions\n"); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -274,8 +272,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) cmd |= PCI_COMMAND_MEMORY; } if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", - pci_name(dev), old_cmd, cmd); + pci_info(dev, "enabling device (%04x -> %04x)\n", old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v1] MIPS: PCI: Use dev_printk() when possible 2018-05-22 13:11 ` [PATCH v1] MIPS: PCI: Use dev_printk() when possible Bjorn Helgaas @ 2018-05-23 8:14 ` James Hogan 2018-05-23 13:48 ` Bjorn Helgaas 0 siblings, 1 reply; 5+ messages in thread From: James Hogan @ 2018-05-23 8:14 UTC (permalink / raw) To: Bjorn Helgaas; +Cc: linux-pci, Ralf Baechle, linux-mips, linux-kernel [-- Attachment #1: Type: text/plain, Size: 1138 bytes --] On Tue, May 22, 2018 at 08:11:42AM -0500, Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > Use the pci_info() and pci_err() wrappers for dev_printk() when possible. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > arch/mips/pci/pci-legacy.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c > index 0c65c38e05d6..73643e80f02d 100644 > --- a/arch/mips/pci/pci-legacy.c > +++ b/arch/mips/pci/pci-legacy.c > @@ -263,9 +263,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) > (!(r->flags & IORESOURCE_ROM_ENABLE))) > continue; > if (!r->start && r->end) { > - printk(KERN_ERR "PCI: Device %s not available " > - "because of resource collisions\n", > - pci_name(dev)); > + pci_err(dev, "can't enable device: resource collisions\n"); The pedantic side of me wants to point out that you could wrap that line after the comma to keep it within 80 columns. Either way though: Acked-by: James Hogan <jhogan@kernel.org> Cheers James [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1] MIPS: PCI: Use dev_printk() when possible 2018-05-23 8:14 ` James Hogan @ 2018-05-23 13:48 ` Bjorn Helgaas 0 siblings, 0 replies; 5+ messages in thread From: Bjorn Helgaas @ 2018-05-23 13:48 UTC (permalink / raw) To: James Hogan; +Cc: linux-pci, Ralf Baechle, linux-mips, linux-kernel On Wed, May 23, 2018 at 09:14:48AM +0100, James Hogan wrote: > On Tue, May 22, 2018 at 08:11:42AM -0500, Bjorn Helgaas wrote: > > From: Bjorn Helgaas <bhelgaas@google.com> > > > > Use the pci_info() and pci_err() wrappers for dev_printk() when possible. > > > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > --- > > arch/mips/pci/pci-legacy.c | 7 ++----- > > 1 file changed, 2 insertions(+), 5 deletions(-) > > > > diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c > > index 0c65c38e05d6..73643e80f02d 100644 > > --- a/arch/mips/pci/pci-legacy.c > > +++ b/arch/mips/pci/pci-legacy.c > > @@ -263,9 +263,7 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask) > > (!(r->flags & IORESOURCE_ROM_ENABLE))) > > continue; > > if (!r->start && r->end) { > > - printk(KERN_ERR "PCI: Device %s not available " > > - "because of resource collisions\n", > > - pci_name(dev)); > > + pci_err(dev, "can't enable device: resource collisions\n"); > > The pedantic side of me wants to point out that you could wrap that line > after the comma to keep it within 80 columns. Done, thanks! > Either way though: > Acked-by: James Hogan <jhogan@kernel.org> > > Cheers > James ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1] MIPS: PCI: Use dev_printk() 2018-05-22 13:11 [PATCH v1] MIPS: PCI: Use dev_printk() Bjorn Helgaas 2018-05-22 13:11 ` [PATCH v1] MIPS: PCI: Use dev_printk() when possible Bjorn Helgaas @ 2018-05-30 16:50 ` Bjorn Helgaas 1 sibling, 0 replies; 5+ messages in thread From: Bjorn Helgaas @ 2018-05-30 16:50 UTC (permalink / raw) To: linux-pci; +Cc: Ralf Baechle, James Hogan, linux-mips, linux-kernel On Tue, May 22, 2018 at 08:11:36AM -0500, Bjorn Helgaas wrote: > Use dev_printk() to follow style of other arches. > > I'll merge via the PCI tree unless there are objections. > > --- > > Bjorn Helgaas (1): > MIPS: PCI: Use dev_printk() when possible > > > arch/mips/pci/pci-legacy.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) Applied with James' ack to pci/misc for v4.18. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-05-30 16:50 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-05-22 13:11 [PATCH v1] MIPS: PCI: Use dev_printk() Bjorn Helgaas 2018-05-22 13:11 ` [PATCH v1] MIPS: PCI: Use dev_printk() when possible Bjorn Helgaas 2018-05-23 8:14 ` James Hogan 2018-05-23 13:48 ` Bjorn Helgaas 2018-05-30 16:50 ` [PATCH v1] MIPS: PCI: Use dev_printk() Bjorn Helgaas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).