From 7d677da205e874bd17572798400c330cf985e914 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sat, 21 Apr 2012 20:32:52 +0200 Subject: [PATCH] --- yaml --- r: 304443 b: refs/heads/master c: 332a81961303dccac8bd3cb5c68aff1b3a6daeb6 h: refs/heads/master i: 304441: bbff1f96c6e4cbfcfdb2436bcfab9d900411bfd4 304439: 2aba44383af27a91268f4295f4e4ebffed0b7ce8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/olpc_dcon/olpc_dcon.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 9656fc897acf..61e19fdcc053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19f798ad009a1c9aebe6c248173e4a7ec694c680 +refs/heads/master: 332a81961303dccac8bd3cb5c68aff1b3a6daeb6 diff --git a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c index 3d9199320d86..862dbb5a1563 100644 --- a/trunk/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/trunk/drivers/staging/olpc_dcon/olpc_dcon.c @@ -71,8 +71,8 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init) ver = dcon_read(dcon, DCON_REG_ID); if ((ver >> 8) != 0xDC) { - printk(KERN_ERR "olpc-dcon: DCON ID not 0xDCxx: 0x%04x " - "instead.\n", ver); + printk(KERN_ERR "olpc-dcon: DCON ID not 0xDCxx: 0x%04x instead.\n", + ver); rc = -ENXIO; goto err; } @@ -136,8 +136,8 @@ static int dcon_bus_stabilize(struct dcon_priv *dcon, int is_powered_down) x = 1; x = olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0); if (x) { - printk(KERN_WARNING "olpc-dcon: unable to force dcon " - "to power up: %d!\n", x); + printk(KERN_WARNING "olpc-dcon: unable to force dcon to power up: %d!\n", + x); return x; } msleep(10); /* we'll be conservative */ @@ -150,8 +150,7 @@ static int dcon_bus_stabilize(struct dcon_priv *dcon, int is_powered_down) x = dcon_read(dcon, DCON_REG_ID); } if (x < 0) { - printk(KERN_ERR "olpc-dcon: unable to stabilize dcon's " - "smbus, reasserting power and praying.\n"); + printk(KERN_ERR "olpc-dcon: unable to stabilize dcon's smbus, reasserting power and praying.\n"); BUG_ON(olpc_board_at_least(olpc_board(0xc2))); x = 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 = olpc_ec_cmd(0x26, (unsigned char *) &x, 1, NULL, 0); if (x) - printk(KERN_WARNING "olpc-dcon: unable to force dcon " - "to power down: %d!\n", x); + printk(KERN_WARNING "olpc-dcon: unable to force dcon to power down: %d!\n", + x); else dcon->asleep = sleep; } else { @@ -232,8 +231,8 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep) dcon->disp_mode |= MODE_BL_ENABLE; x = dcon_bus_stabilize(dcon, 1); if (x) - printk(KERN_WARNING "olpc-dcon: unable to reinit dcon" - " hardware: %d!\n", x); + printk(KERN_WARNING "olpc-dcon: unable to reinit dcon hardware: %d!\n", + x); else dcon->asleep = sleep;