diff options
Diffstat (limited to 'drivers/video/omap')
-rw-r--r-- | drivers/video/omap/lcd_h3.c | 6 | ||||
-rw-r--r-- | drivers/video/omap/lcd_inn1610.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c index 51807b4e26d1..c604d935c188 100644 --- a/drivers/video/omap/lcd_h3.c +++ b/drivers/video/omap/lcd_h3.c | |||
@@ -28,8 +28,6 @@ | |||
28 | 28 | ||
29 | #define MODULE_NAME "omapfb-lcd_h3" | 29 | #define MODULE_NAME "omapfb-lcd_h3" |
30 | 30 | ||
31 | #define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args) | ||
32 | |||
33 | static int h3_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) | 31 | static int h3_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |
34 | { | 32 | { |
35 | return 0; | 33 | return 0; |
@@ -48,7 +46,7 @@ static int h3_panel_enable(struct lcd_panel *panel) | |||
48 | if (!r) | 46 | if (!r) |
49 | r = tps65010_set_gpio_out_value(GPIO2, HIGH); | 47 | r = tps65010_set_gpio_out_value(GPIO2, HIGH); |
50 | if (r) | 48 | if (r) |
51 | pr_err("Unable to turn on LCD panel\n"); | 49 | pr_err(MODULE_NAME ": Unable to turn on LCD panel\n"); |
52 | 50 | ||
53 | return r; | 51 | return r; |
54 | } | 52 | } |
@@ -62,7 +60,7 @@ static void h3_panel_disable(struct lcd_panel *panel) | |||
62 | if (!r) | 60 | if (!r) |
63 | tps65010_set_gpio_out_value(GPIO2, LOW); | 61 | tps65010_set_gpio_out_value(GPIO2, LOW); |
64 | if (r) | 62 | if (r) |
65 | pr_err("Unable to turn off LCD panel\n"); | 63 | pr_err(MODULE_NAME ": Unable to turn off LCD panel\n"); |
66 | } | 64 | } |
67 | 65 | ||
68 | static unsigned long h3_panel_get_caps(struct lcd_panel *panel) | 66 | static unsigned long h3_panel_get_caps(struct lcd_panel *panel) |
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c index 95604ca43301..5ef119c813e0 100644 --- a/drivers/video/omap/lcd_inn1610.c +++ b/drivers/video/omap/lcd_inn1610.c | |||
@@ -27,20 +27,18 @@ | |||
27 | 27 | ||
28 | #define MODULE_NAME "omapfb-lcd_h3" | 28 | #define MODULE_NAME "omapfb-lcd_h3" |
29 | 29 | ||
30 | #define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args) | ||
31 | |||
32 | static int innovator1610_panel_init(struct lcd_panel *panel, | 30 | static int innovator1610_panel_init(struct lcd_panel *panel, |
33 | struct omapfb_device *fbdev) | 31 | struct omapfb_device *fbdev) |
34 | { | 32 | { |
35 | int r = 0; | 33 | int r = 0; |
36 | 34 | ||
37 | if (omap_request_gpio(14)) { | 35 | if (omap_request_gpio(14)) { |
38 | pr_err("can't request GPIO 14\n"); | 36 | pr_err(MODULE_NAME ": can't request GPIO 14\n"); |
39 | r = -1; | 37 | r = -1; |
40 | goto exit; | 38 | goto exit; |
41 | } | 39 | } |
42 | if (omap_request_gpio(15)) { | 40 | if (omap_request_gpio(15)) { |
43 | pr_err("can't request GPIO 15\n"); | 41 | pr_err(MODULE_NAME ": can't request GPIO 15\n"); |
44 | omap_free_gpio(14); | 42 | omap_free_gpio(14); |
45 | r = -1; | 43 | r = -1; |
46 | goto exit; | 44 | goto exit; |