Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / drivers / pwm / pwm-samsung.c

diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c
index 35fa0e8b0f87444bbaf4241fa2889c018c1c8f49..d10386528c9ce4c684413f750960b23a12225fa8 100644 (file)
--- a/drivers/pwm/pwm-samsung.c
+++ b/drivers/pwm/pwm-samsung.c
@@ -11,6 +11,8 @@
  * the Free Software Foundation; either version 2 of the License.
 */
 
+#define pr_fmt(fmt) "pwm-samsung: " fmt
+
 #include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
@@ -340,13 +342,13 @@ static int __init pwm_init(void)
        clk_scaler[1] = clk_get(NULL, "pwm-scaler1");
 
        if (IS_ERR(clk_scaler[0]) || IS_ERR(clk_scaler[1])) {
-               printk(KERN_ERR "%s: failed to get scaler clocks\n", __func__);
+               pr_err("failed to get scaler clocks\n");
                return -EINVAL;
        }
 
        ret = platform_driver_register(&s3c_pwm_driver);
        if (ret)
-               printk(KERN_ERR "%s: failed to add pwm driver\n", __func__);
+               pr_err("failed to add pwm driver\n");
 
        return ret;
 }