[07/16] gpu: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

Commit Message

Joe Perches Oct. 28, 2012, 8:05 a.m. UTC

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 <[e-mail]>
---
 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(-)

Patch

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