linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/16] treewide: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
@ 2012-10-28  8:05 Joe Perches
  2012-10-28  8:05 ` [PATCH 11/16] pci: " Joe Perches
  2012-10-28 10:54 ` [PATCH 00/16] treewide: " Sergei Shtylyov
  0 siblings, 2 replies; 5+ messages in thread
From: Joe Perches @ 2012-10-28  8:05 UTC (permalink / raw)
  To: linux-ide, linux-arm-kernel, dri-devel, netdev, linux-wireless,
	linux-pci, linux-pcmcia, linux-scsi, devel, virtualization,
	linux-watchdog
  Cc: linux-kernel, linux-i2c, linux-usb, alsa-devel

dev_<level> create smaller objects than dev_printk(KERN_<LEVEL>.
Convert non-debug calls to this form.

Joe Perches (16):
  tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  drivers: base: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  block: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  pcmcia: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  dma: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  gpu: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  i2c: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  wireless: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  ethernet: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  pci: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  scsi: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  usb: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  watchdog: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

 arch/tile/kernel/pci_gx.c                   |   15 ++---
 drivers/ata/pata_cmd64x.c                   |    6 +-
 drivers/base/attribute_container.c          |    2 +-
 drivers/base/devres.c                       |    4 +-
 drivers/block/umem.c                        |   97 ++++++++++++--------------
 drivers/char/pcmcia/cm4040_cs.c             |    5 +-
 drivers/dma/at_hdmac_regs.h                 |    8 +-
 drivers/dma/iop-adma.c                      |   45 ++++++------
 drivers/dma/mv_xor.c                        |   62 ++++++++----------
 drivers/gpu/drm/gma500/cdv_intel_crt.c      |    3 +-
 drivers/gpu/drm/gma500/cdv_intel_lvds.c     |    7 +-
 drivers/gpu/drm/gma500/psb_intel_lvds.c     |    7 +-
 drivers/gpu/drm/i915/intel_opregion.c       |    8 +-
 drivers/i2c/busses/i2c-piix4.c              |    5 +-
 drivers/net/ethernet/chelsio/cxgb3/common.h |    7 +-
 drivers/net/ethernet/marvell/pxa168_eth.c   |    7 +-
 drivers/net/wireless/at76c50x-usb.c         |   85 +++++++++++------------
 drivers/net/wireless/iwlegacy/common.h      |    5 +-
 drivers/net/wireless/iwlwifi/pcie/trans.c   |   28 +++-----
 drivers/pci/irq.c                           |   10 ++--
 drivers/pci/pci-stub.c                      |    2 +-
 drivers/pci/pcie/aspm.c                     |    7 +--
 drivers/pcmcia/cistpl.c                     |   10 +--
 drivers/pcmcia/cs.c                         |   28 +++-----
 drivers/pcmcia/ds.c                         |   38 +++++------
 drivers/pcmcia/pcmcia_cis.c                 |    4 +-
 drivers/pcmcia/pcmcia_resource.c            |   11 +--
 drivers/pcmcia/rsrc_nonstatic.c             |   24 +++----
 drivers/pcmcia/ti113x.h                     |   80 +++++++++++------------
 drivers/pcmcia/yenta_socket.c               |   61 ++++++++---------
 drivers/scsi/53c700.c                       |    2 +-
 drivers/scsi/aic7xxx/aic79xx_osm_pci.c      |    4 +-
 drivers/scsi/aic7xxx/aic7xxx_osm_pci.c      |    4 +-
 drivers/scsi/aic94xx/aic94xx_tmf.c          |    4 +-
 drivers/scsi/bfa/bfad.c                     |   32 ++++-----
 drivers/scsi/fcoe/fcoe_sysfs.c              |    3 +-
 drivers/scsi/lasi700.c                      |    2 +-
 drivers/scsi/libsas/sas_task.c              |    9 +--
 drivers/scsi/lpfc/lpfc_attr.c               |    8 +-
 drivers/scsi/lpfc/lpfc_debugfs.h            |    6 +-
 drivers/scsi/lpfc/lpfc_hbadisc.c            |    4 +-
 drivers/scsi/lpfc/lpfc_init.c               |   45 ++++++-------
 drivers/scsi/mpt2sas/mpt2sas_transport.c    |   91 ++++++++++++-------------
 drivers/scsi/mvsas/mv_64xx.c                |    2 +-
 drivers/scsi/mvsas/mv_chips.h               |    8 +-
 drivers/scsi/mvsas/mv_init.c                |   14 ++--
 drivers/scsi/mvsas/mv_sas.c                 |    9 +--
 drivers/scsi/pm8001/pm8001_init.c           |   10 +--
 drivers/scsi/pm8001/pm8001_sas.c            |    4 +-
 drivers/scsi/raid_class.c                   |    8 +-
 drivers/scsi/scsi_scan.c                    |    3 +-
 drivers/scsi/scsi_transport_fc.c            |   31 ++++-----
 drivers/scsi/scsi_transport_sas.c           |    7 +-
 drivers/scsi/sni_53c710.c                   |    2 +-
 drivers/scsi/zalon.c                        |    4 +-
 drivers/usb/core/hub.c                      |    2 +-
 drivers/virtio/virtio_balloon.c             |    7 +-
 drivers/watchdog/mpcore_wdt.c               |   19 +++---
 sound/pci/asihpi/hpidspcd.c                 |   22 +++----
 sound/pci/asihpi/hpioctl.c                  |   17 ++---
 60 files changed, 485 insertions(+), 579 deletions(-)

-- 
1.7.8.112.g3fd21


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 11/16] pci: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  2012-10-28  8:05 [PATCH 00/16] treewide: Convert dev_printk(KERN_<LEVEL> to dev_<level>( Joe Perches
@ 2012-10-28  8:05 ` Joe Perches
  2012-11-05 22:28   ` Bjorn Helgaas
  2012-10-28 10:54 ` [PATCH 00/16] treewide: " Sergei Shtylyov
  1 sibling, 1 reply; 5+ messages in thread
From: Joe Perches @ 2012-10-28  8:05 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: linux-pci, linux-kernel

dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
and reducing object size is good.
Coalesce formats for easier grep.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/pci/irq.c       |   10 +++++-----
 drivers/pci/pci-stub.c  |    2 +-
 drivers/pci/pcie/aspm.c |    7 ++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c
index e5f69a4..b008cf8 100644
--- a/drivers/pci/irq.c
+++ b/drivers/pci/irq.c
@@ -14,11 +14,11 @@ static void pci_note_irq_problem(struct pci_dev *pdev, const char *reason)
 {
 	struct pci_dev *parent = to_pci_dev(pdev->dev.parent);
 
-	dev_printk(KERN_ERR, &pdev->dev,
-		   "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
-		   dev_name(&parent->dev), parent->vendor, parent->device);
-	dev_printk(KERN_ERR, &pdev->dev, "%s\n", reason);
-	dev_printk(KERN_ERR, &pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
+	dev_err(&pdev->dev,
+		"Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
+		dev_name(&parent->dev), parent->vendor, parent->device);
+	dev_err(&pdev->dev, "%s\n", reason);
+	dev_err(&pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
 	WARN_ON(1);
 }
 
diff --git a/drivers/pci/pci-stub.c b/drivers/pci/pci-stub.c
index 775e933..6e47c51 100644
--- a/drivers/pci/pci-stub.c
+++ b/drivers/pci/pci-stub.c
@@ -28,7 +28,7 @@ MODULE_PARM_DESC(ids, "Initial PCI IDs to add to the stub driver, format is "
 
 static int pci_stub_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
-	dev_printk(KERN_INFO, &dev->dev, "claimed by stub\n");
+	dev_info(&dev->dev, "claimed by stub\n");
 	return 0;
 }
 
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 213753b..3da9ecc 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -242,8 +242,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)
 		return;
 
 	/* Training failed. Restore common clock configurations */
-	dev_printk(KERN_ERR, &parent->dev,
-		   "ASPM: Could not configure common clock\n");
+	dev_err(&parent->dev, "ASPM: Could not configure common clock\n");
 	list_for_each_entry(child, &linkbus->devices, bus_list)
 		pcie_capability_write_word(child, PCI_EXP_LNKCTL,
 					   child_reg[PCI_FUNC(child->devfn)]);
@@ -507,9 +506,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
 		 */
 		pcie_capability_read_dword(child, PCI_EXP_DEVCAP, &reg32);
 		if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
-			dev_printk(KERN_INFO, &child->dev, "disabling ASPM"
-				" on pre-1.1 PCIe device.  You can enable it"
-				" with 'pcie_aspm=force'\n");
+			dev_info(&child->dev, "disabling ASPM on pre-1.1 PCIe device.  You can enable it with 'pcie_aspm=force'\n");
 			return -EINVAL;
 		}
 	}
-- 
1.7.8.112.g3fd21


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 00/16] treewide: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  2012-10-28  8:05 [PATCH 00/16] treewide: Convert dev_printk(KERN_<LEVEL> to dev_<level>( Joe Perches
  2012-10-28  8:05 ` [PATCH 11/16] pci: " Joe Perches
@ 2012-10-28 10:54 ` Sergei Shtylyov
  2012-10-28 12:12   ` Joe Perches
  1 sibling, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2012-10-28 10:54 UTC (permalink / raw)
  To: Joe Perches
  Cc: linux-ide, linux-arm-kernel, dri-devel, netdev, linux-wireless,
	linux-pci, linux-pcmcia, linux-scsi, devel, virtualization,
	linux-watchdog, linux-kernel, linux-i2c, linux-usb, alsa-devel

Hello.

On 28-10-2012 12:05, Joe Perches wrote:

> dev_<level> create smaller objects than dev_printk(KERN_<LEVEL>.
> Convert non-debug calls to this form.

> Joe Perches (16):
>    tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
[...]
>    tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
[...]
>    tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

    Hm, somehow this patch is repeated thrice?

MBR, Sergei


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 00/16] treewide: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  2012-10-28 10:54 ` [PATCH 00/16] treewide: " Sergei Shtylyov
@ 2012-10-28 12:12   ` Joe Perches
  0 siblings, 0 replies; 5+ messages in thread
From: Joe Perches @ 2012-10-28 12:12 UTC (permalink / raw)
  To: Sergei Shtylyov
  Cc: linux-ide, linux-arm-kernel, dri-devel, netdev, linux-wireless,
	linux-pci, linux-pcmcia, linux-scsi, devel, virtualization,
	linux-watchdog, linux-kernel, linux-i2c, linux-usb, alsa-devel

On Sun, 2012-10-28 at 14:54 +0400, Sergei Shtylyov wrote:
> Hello.

Hi Sergei.

> On 28-10-2012 12:05, Joe Perches wrote:
> 
> > dev_<level> create smaller objects than dev_printk(KERN_<LEVEL>.
> > Convert non-debug calls to this form.
> 
> > Joe Perches (16):
> >    tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
> [...]
> >    tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
> [...]
> >    tile: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
> 
>     Hm, somehow this patch is repeated thrice?

Nope, I forgot to edit the 0000 file after I edited
patches locally when I noticed I forgot to update
the subject lines.  Patches are corrected, 0000 not.

I don't think it's a bit deal, I could repost just the 0000
if you want though.

cheers, Joe




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 11/16] pci: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  2012-10-28  8:05 ` [PATCH 11/16] pci: " Joe Perches
@ 2012-11-05 22:28   ` Bjorn Helgaas
  0 siblings, 0 replies; 5+ messages in thread
From: Bjorn Helgaas @ 2012-11-05 22:28 UTC (permalink / raw)
  To: Joe Perches; +Cc: linux-pci, linux-kernel

On Sun, Oct 28, 2012 at 2:05 AM, Joe Perches <joe@perches.com> wrote:
> dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
> and reducing object size is good.
> Coalesce formats for easier grep.
>
> Signed-off-by: Joe Perches <joe@perches.com>

I applied this to my pci/misc branch as v3.8 material.  Thanks!

> ---
>  drivers/pci/irq.c       |   10 +++++-----
>  drivers/pci/pci-stub.c  |    2 +-
>  drivers/pci/pcie/aspm.c |    7 ++-----
>  3 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c
> index e5f69a4..b008cf8 100644
> --- a/drivers/pci/irq.c
> +++ b/drivers/pci/irq.c
> @@ -14,11 +14,11 @@ static void pci_note_irq_problem(struct pci_dev *pdev, const char *reason)
>  {
>         struct pci_dev *parent = to_pci_dev(pdev->dev.parent);
>
> -       dev_printk(KERN_ERR, &pdev->dev,
> -                  "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
> -                  dev_name(&parent->dev), parent->vendor, parent->device);
> -       dev_printk(KERN_ERR, &pdev->dev, "%s\n", reason);
> -       dev_printk(KERN_ERR, &pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
> +       dev_err(&pdev->dev,
> +               "Potentially misrouted IRQ (Bridge %s %04x:%04x)\n",
> +               dev_name(&parent->dev), parent->vendor, parent->device);
> +       dev_err(&pdev->dev, "%s\n", reason);
> +       dev_err(&pdev->dev, "Please report to linux-kernel@vger.kernel.org\n");
>         WARN_ON(1);
>  }
>
> diff --git a/drivers/pci/pci-stub.c b/drivers/pci/pci-stub.c
> index 775e933..6e47c51 100644
> --- a/drivers/pci/pci-stub.c
> +++ b/drivers/pci/pci-stub.c
> @@ -28,7 +28,7 @@ MODULE_PARM_DESC(ids, "Initial PCI IDs to add to the stub driver, format is "
>
>  static int pci_stub_probe(struct pci_dev *dev, const struct pci_device_id *id)
>  {
> -       dev_printk(KERN_INFO, &dev->dev, "claimed by stub\n");
> +       dev_info(&dev->dev, "claimed by stub\n");
>         return 0;
>  }
>
> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
> index 213753b..3da9ecc 100644
> --- a/drivers/pci/pcie/aspm.c
> +++ b/drivers/pci/pcie/aspm.c
> @@ -242,8 +242,7 @@ static void pcie_aspm_configure_common_clock(struct pcie_link_state *link)
>                 return;
>
>         /* Training failed. Restore common clock configurations */
> -       dev_printk(KERN_ERR, &parent->dev,
> -                  "ASPM: Could not configure common clock\n");
> +       dev_err(&parent->dev, "ASPM: Could not configure common clock\n");
>         list_for_each_entry(child, &linkbus->devices, bus_list)
>                 pcie_capability_write_word(child, PCI_EXP_LNKCTL,
>                                            child_reg[PCI_FUNC(child->devfn)]);
> @@ -507,9 +506,7 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
>                  */
>                 pcie_capability_read_dword(child, PCI_EXP_DEVCAP, &reg32);
>                 if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
> -                       dev_printk(KERN_INFO, &child->dev, "disabling ASPM"
> -                               " on pre-1.1 PCIe device.  You can enable it"
> -                               " with 'pcie_aspm=force'\n");
> +                       dev_info(&child->dev, "disabling ASPM on pre-1.1 PCIe device.  You can enable it with 'pcie_aspm=force'\n");
>                         return -EINVAL;
>                 }
>         }
> --
> 1.7.8.112.g3fd21
>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2012-11-05 22:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-28  8:05 [PATCH 00/16] treewide: Convert dev_printk(KERN_<LEVEL> to dev_<level>( Joe Perches
2012-10-28  8:05 ` [PATCH 11/16] pci: " Joe Perches
2012-11-05 22:28   ` Bjorn Helgaas
2012-10-28 10:54 ` [PATCH 00/16] treewide: " Sergei Shtylyov
2012-10-28 12:12   ` Joe Perches

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).