From: Joe Perches <joe@perches.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 07/16] gpu: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
Date: Sun, 28 Oct 2012 01:05:45 -0700 [thread overview]
Message-ID: <8a5cd2f8951f01f08e4a8d420a0b64f395d04bc7.1351411047.git.joe@perches.com> (raw)
In-Reply-To: <cover.1351411047.git.joe@perches.com>
dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
and reducing object size is good.
Coalesce multiline formats for easier grep.
Coalesce unnecessarily segmented formats on a single line too.
Remove trailing space after newline in a format.
Signed-off-by: Joe Perches <joe@perches.com>
---
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 ++++----
4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c
index 8c17534..33ee3f4 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_crt.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c
@@ -296,8 +296,7 @@ void cdv_intel_crt_init(struct drm_device *dev,
psb_intel_encoder->ddc_bus = psb_intel_i2c_create(dev,
i2c_reg, "CRTDDC_A");
if (!psb_intel_encoder->ddc_bus) {
- dev_printk(KERN_ERR, &dev->pdev->dev, "DDC bus registration "
- "failed.\n");
+ dev_err(&dev->pdev->dev, "DDC bus registration failed\n");
goto failed_ddc;
}
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index b362dd3..38184f6 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -686,8 +686,7 @@ void cdv_intel_lvds_init(struct drm_device *dev,
GPIOB,
"LVDSBLC_B");
if (!psb_intel_encoder->i2c_bus) {
- dev_printk(KERN_ERR,
- &dev->pdev->dev, "I2C bus registration failed.\n");
+ dev_err(&dev->pdev->dev, "I2C bus registration failed\n");
goto failed_blc_i2c;
}
psb_intel_encoder->i2c_bus->slave_addr = 0x2C;
@@ -708,8 +707,8 @@ void cdv_intel_lvds_init(struct drm_device *dev,
GPIOC,
"LVDSDDC_C");
if (!psb_intel_encoder->ddc_bus) {
- dev_printk(KERN_ERR, &dev->pdev->dev,
- "DDC bus registration " "failed.\n");
+ dev_err(&dev->pdev->dev,
+ "DDC bus registration failed\n");
goto failed_ddc;
}
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 2a4c3a9..d1931cf 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -759,8 +759,7 @@ void psb_intel_lvds_init(struct drm_device *dev,
*/
lvds_priv->i2c_bus = psb_intel_i2c_create(dev, GPIOB, "LVDSBLC_B");
if (!lvds_priv->i2c_bus) {
- dev_printk(KERN_ERR,
- &dev->pdev->dev, "I2C bus registration failed.\n");
+ dev_err(&dev->pdev->dev, "I2C bus registration failed\n");
goto failed_blc_i2c;
}
lvds_priv->i2c_bus->slave_addr = 0x2C;
@@ -779,8 +778,8 @@ void psb_intel_lvds_init(struct drm_device *dev,
/* Set up the DDC bus. */
lvds_priv->ddc_bus = psb_intel_i2c_create(dev, GPIOC, "LVDSDDC_C");
if (!lvds_priv->ddc_bus) {
- dev_printk(KERN_ERR, &dev->pdev->dev,
- "DDC bus registration " "failed.\n");
+ dev_err(&dev->pdev->dev,
+ "DDC bus registration failed\n");
goto failed_ddc;
}
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 5530413..fe31b23 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -366,8 +366,8 @@ static void intel_didl_outputs(struct drm_device *dev)
list_for_each_entry(acpi_cdev, &acpi_video_bus->children, node) {
if (i >= 8) {
- dev_printk(KERN_ERR, &dev->pdev->dev,
- "More than 8 outputs detected\n");
+ dev_err(&dev->pdev->dev,
+ "More than 8 outputs detected\n");
return;
}
status =
@@ -393,8 +393,8 @@ blind_set:
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
int output_type = ACPI_OTHER_OUTPUT;
if (i >= 8) {
- dev_printk(KERN_ERR, &dev->pdev->dev,
- "More than 8 outputs detected\n");
+ dev_err(&dev->pdev->dev,
+ "More than 8 outputs detected\n");
return;
}
switch (connector->connector_type) {
--
1.7.8.112.g3fd21
next prev parent reply other threads:[~2012-10-28 8:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-28 8:05 [PATCH 00/16] treewide: " Joe Perches
2012-10-28 8:05 ` [PATCH 01/16] tile: " Joe Perches
2012-10-28 12:54 ` Chris Metcalf
2012-10-28 8:05 ` [PATCH 02/16] ata: " Joe Perches
2012-11-28 17:42 ` Jeff Garzik
2012-10-28 8:05 ` [PATCH 03/16] drivers: base: " Joe Perches
2012-10-28 8:05 ` [PATCH 04/16] block: " Joe Perches
2012-10-28 8:05 ` [PATCH 05/16] pcmcia: " Joe Perches
2012-10-28 8:05 ` [PATCH 06/16] dma: " Joe Perches
2012-10-29 5:54 ` Vinod Koul
2012-10-28 8:05 ` Joe Perches [this message]
2012-10-28 8:05 ` [PATCH 08/16] i2c: " Joe Perches
2012-10-28 11:45 ` Jean Delvare
2012-10-28 8:05 ` [PATCH 09/16] wireless: " Joe Perches
2012-10-28 8:05 ` [PATCH 10/16] ethernet: " Joe Perches
2012-11-03 2:00 ` David Miller
2012-10-28 8:05 ` [PATCH 11/16] pci: " Joe Perches
2012-11-05 22:28 ` Bjorn Helgaas
2012-10-28 8:05 ` [PATCH 12/16] scsi: " Joe Perches
2012-10-28 8:05 ` [PATCH 13/16] usb: " Joe Perches
2012-10-28 8:05 ` [PATCH 14/16] virtio: " Joe Perches
2012-10-31 23:54 ` Rusty Russell
2012-10-28 8:05 ` [PATCH 15/16] watchdog: " Joe Perches
2012-10-28 8:05 ` [PATCH 16/16] sound: " Joe Perches
2012-10-28 8:59 ` Takashi Iwai
2012-10-28 10:54 ` [PATCH 00/16] treewide: " Sergei Shtylyov
2012-10-28 12:12 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8a5cd2f8951f01f08e4a8d420a0b64f395d04bc7.1351411047.git.joe@perches.com \
--to=joe@perches.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®