redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: olpc_dcon.c: strings printed with printk() put on a single line 

Quoted strings that were broken over multiple lines are put on a
single line for easier grep'ability.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Jesper Juhl 2012-04-21 20:32:52 +02:00 committed by Greg Kroah-Hartman
parent 19f798ad00
commit 332a819613
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/staging/olpc_dcon/olpc_dcon.c
View File

@ -71,8 +71,8 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
ver = dcon_read(dcon, DCON_REG_ID); ver = dcon_read(dcon, DCON_REG_ID);
if ((ver >> 8) != 0xDC) { if ((ver >> 8) != 0xDC) {
printk(KERN_ERR "olpc-dcon: DCON ID not 0xDCxx: 0x%04x " printk(KERN_ERR "olpc-dcon: DCON ID not 0xDCxx: 0x%04x instead.\n",
"instead.\n", ver); ver);
rc = -ENXIO; rc = -ENXIO;
goto err; goto err;
} }
@ -136,8 +136,8 @@ power_up:
x = 1; x = 1;
x = olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0); x = olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0);
if (x) { if (x) {
printk(KERN_WARNING "olpc-dcon: unable to force dcon " printk(KERN_WARNING "olpc-dcon: unable to force dcon to power up: %d!\n",
"to power up: %d!\n", x); x);
return x; return x;
} }
msleep(10); /* we'll be conservative */ msleep(10); /* we'll be conservative */
@ -150,8 +150,7 @@ power_up:
x = dcon_read(dcon, DCON_REG_ID); x = dcon_read(dcon, DCON_REG_ID);
} }
if (x < 0) { if (x < 0) {
printk(KERN_ERR "olpc-dcon: unable to stabilize dcon's " printk(KERN_ERR "olpc-dcon: unable to stabilize dcon's smbus, reasserting power and praying.\n");
"smbus, reasserting power and praying.\n");
BUG_ON(olpc_board_at_least(olpc_board(0xc2))); BUG_ON(olpc_board_at_least(olpc_board(0xc2)));
x = 0; x = 0;
olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0); olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0);
@ -222,8 +221,8 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep)
x = 0; x = 0;
x = olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0); x = olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0);
if (x) if (x)
printk(KERN_WARNING "olpc-dcon: unable to force dcon " printk(KERN_WARNING "olpc-dcon: unable to force dcon to power down: %d!\n",
"to power down: %d!\n", x); x);
else else
dcon->asleep = sleep; dcon->asleep = sleep;
} else { } else {
@ -232,8 +231,8 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep)
dcon->disp_mode |= MODE_BL_ENABLE; dcon->disp_mode |= MODE_BL_ENABLE;
x = dcon_bus_stabilize(dcon, 1); x = dcon_bus_stabilize(dcon, 1);
if (x) if (x)
printk(KERN_WARNING "olpc-dcon: unable to reinit dcon" printk(KERN_WARNING "olpc-dcon: unable to reinit dcon hardware: %d!\n",
" hardware: %d!\n", x); x);
else else
dcon->asleep = sleep; dcon->asleep = sleep;