Commit 20c225cbb679e12edac3c335357245112152a158
Committed by
Linus Torvalds
Linus Torvalds
1 parent
8c7610f3b4
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
backlight: jornada720: use pr_err()/pr_info() instead of printk()
Use pr_err()/pr_info() instead of printk() to allow dynamic debugging. The pr_fmt prefix for pr_ macros is used. Also fix checkpatch warnings as below: WARNING: Prefer pr_err(... to printk(KERN_ERR, ... WARNING: Prefer pr_info(... to printk(KERN_INFO, ... [akpm@linux-foundation.org: use KBUILD_MODNAME, per Joe] Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 2 changed files with 13 additions and 9 deletions Side-by-side Diff
drivers/video/backlight/jornada720_bl.c
| ... | ... | @@ -9,6 +9,8 @@ |
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | |
| 13 | + | |
| 12 | 14 | #include <linux/backlight.h> |
| 13 | 15 | #include <linux/device.h> |
| 14 | 16 | #include <linux/fb.h> |
| ... | ... | @@ -38,7 +40,7 @@ |
| 38 | 40 | ret = jornada_ssp_byte(GETBRIGHTNESS); |
| 39 | 41 | |
| 40 | 42 | if (jornada_ssp_byte(GETBRIGHTNESS) != TXDUMMY) { |
| 41 | - printk(KERN_ERR "bl : get brightness timeout\n"); | |
| 43 | + pr_err("get brightness timeout\n"); | |
| 42 | 44 | jornada_ssp_end(); |
| 43 | 45 | return -ETIMEDOUT; |
| 44 | 46 | } else /* exchange txdummy for value */ |
| ... | ... | @@ -59,7 +61,7 @@ |
| 59 | 61 | if ((bd->props.power != FB_BLANK_UNBLANK) || (bd->props.fb_blank != FB_BLANK_UNBLANK)) { |
| 60 | 62 | ret = jornada_ssp_byte(BRIGHTNESSOFF); |
| 61 | 63 | if (ret != TXDUMMY) { |
| 62 | - printk(KERN_INFO "bl : brightness off timeout\n"); | |
| 64 | + pr_info("brightness off timeout\n"); | |
| 63 | 65 | /* turn off backlight */ |
| 64 | 66 | PPSR &= ~PPC_LDD1; |
| 65 | 67 | PPDR |= PPC_LDD1; |
| ... | ... | @@ -70,7 +72,7 @@ |
| 70 | 72 | |
| 71 | 73 | /* send command to our mcu */ |
| 72 | 74 | if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) { |
| 73 | - printk(KERN_INFO "bl : failed to set brightness\n"); | |
| 75 | + pr_info("failed to set brightness\n"); | |
| 74 | 76 | ret = -ETIMEDOUT; |
| 75 | 77 | goto out; |
| 76 | 78 | } |
| ... | ... | @@ -81,7 +83,7 @@ |
| 81 | 83 | but due to physical layout it is equal to 0, so we simply |
| 82 | 84 | invert the value (MAX VALUE - NEW VALUE). */ |
| 83 | 85 | if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness) != TXDUMMY) { |
| 84 | - printk(KERN_ERR "bl : set brightness failed\n"); | |
| 86 | + pr_err("set brightness failed\n"); | |
| 85 | 87 | ret = -ETIMEDOUT; |
| 86 | 88 | } |
| 87 | 89 | |
| ... | ... | @@ -113,7 +115,7 @@ |
| 113 | 115 | |
| 114 | 116 | if (IS_ERR(bd)) { |
| 115 | 117 | ret = PTR_ERR(bd); |
| 116 | - printk(KERN_ERR "bl : failed to register device, err=%x\n", ret); | |
| 118 | + pr_err("failed to register device, err=%x\n", ret); | |
| 117 | 119 | return ret; |
| 118 | 120 | } |
| 119 | 121 | |
| ... | ... | @@ -125,7 +127,7 @@ |
| 125 | 127 | jornada_bl_update_status(bd); |
| 126 | 128 | |
| 127 | 129 | platform_set_drvdata(pdev, bd); |
| 128 | - printk(KERN_INFO "HP Jornada 700 series backlight driver\n"); | |
| 130 | + pr_info("HP Jornada 700 series backlight driver\n"); | |
| 129 | 131 | |
| 130 | 132 | return 0; |
| 131 | 133 | } |
drivers/video/backlight/jornada720_lcd.c
| ... | ... | @@ -9,6 +9,8 @@ |
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | |
| 13 | + | |
| 12 | 14 | #include <linux/device.h> |
| 13 | 15 | #include <linux/fb.h> |
| 14 | 16 | #include <linux/kernel.h> |
| ... | ... | @@ -44,7 +46,7 @@ |
| 44 | 46 | jornada_ssp_start(); |
| 45 | 47 | |
| 46 | 48 | if (jornada_ssp_byte(GETCONTRAST) != TXDUMMY) { |
| 47 | - printk(KERN_ERR "lcd: get contrast failed\n"); | |
| 49 | + pr_err("get contrast failed\n"); | |
| 48 | 50 | jornada_ssp_end(); |
| 49 | 51 | return -ETIMEDOUT; |
| 50 | 52 | } else { |
| ... | ... | @@ -65,7 +67,7 @@ |
| 65 | 67 | |
| 66 | 68 | /* push the new value */ |
| 67 | 69 | if (jornada_ssp_byte(value) != TXDUMMY) { |
| 68 | - printk(KERN_ERR "lcd : set contrast failed\n"); | |
| 70 | + pr_err("set contrast failed\n"); | |
| 69 | 71 | jornada_ssp_end(); |
| 70 | 72 | return -ETIMEDOUT; |
| 71 | 73 | } |
| ... | ... | @@ -103,7 +105,7 @@ |
| 103 | 105 | |
| 104 | 106 | if (IS_ERR(lcd_device)) { |
| 105 | 107 | ret = PTR_ERR(lcd_device); |
| 106 | - printk(KERN_ERR "lcd : failed to register device\n"); | |
| 108 | + pr_err("failed to register device\n"); | |
| 107 | 109 | return ret; |
| 108 | 110 | } |
| 109 | 111 |