Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 332a8196 authored by Jesper Juhl's avatar Jesper Juhl Committed by Greg Kroah-Hartman
Browse files

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: default avatarJesper Juhl <jj@chaosbits.net>
Acked-by: default avatarAndres Salomon <dilinger@queued.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19f798ad

drivers/staging/olpc_dcon/olpc_dcon.c

+9 −10
Original line number Diff line number Diff line
@@ -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;