A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make the pr_*() family of macros in kernel.h complete

Browse source 
Other/Some pr_*() macros are already defined in kernel.h, but pr_err() was
defined multiple times in several other places

Signed-off-by: Emil Medve <[email protected]>
Cc: Jean Delvare <[email protected]>
Cc: Jeff Garzik <[email protected]>
Cc: "Antonino A. Daplas" <[email protected]>
Cc: Tony Lindgren <[email protected]>
Reviewed-by: Satyam Sharma <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Emil Medve 2007-10-16 23:29:48 -07:00 • committed by Linus Torvalds
commit 1f7c8234c7
5 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/video/omap/lcd_h3.c
View file

@ -28,8 +28,6 @@
#define MODULE_NAME "omapfb-lcd_h3"
#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args)
static int h3_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
{
return 0;
@ -48,7 +46,7 @@ static int h3_panel_enable(struct lcd_panel *panel)
if (!r)
r = tps65010_set_gpio_out_value(GPIO2, HIGH);
if (r)
pr_err("Unable to turn on LCD panel\n");
pr_err(MODULE_NAME ": Unable to turn on LCD panel\n");
return r;
}
@ -62,7 +60,7 @@ static void h3_panel_disable(struct lcd_panel *panel)
if (!r)
tps65010_set_gpio_out_value(GPIO2, LOW);
if (r)
pr_err("Unable to turn off LCD panel\n");
pr_err(MODULE_NAME ": Unable to turn off LCD panel\n");
}
static unsigned long h3_panel_get_caps(struct lcd_panel *panel)

6
drivers/video/omap/lcd_inn1610.c
View file

@ -27,20 +27,18 @@
#define MODULE_NAME "omapfb-lcd_h3"
#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args)
static int innovator1610_panel_init(struct lcd_panel *panel,
struct omapfb_device *fbdev)
{
int r = 0;
if (omap_request_gpio(14)) {
pr_err("can't request GPIO 14\n");
pr_err(MODULE_NAME ": can't request GPIO 14\n");
r = -1;
goto exit;
}
if (omap_request_gpio(15)) {
pr_err("can't request GPIO 15\n");
pr_err(MODULE_NAME ": can't request GPIO 15\n");
omap_free_gpio(14);
r = -1;
goto exit;