Commit 5f6791ec authored by Emmanuil Chatzipetru's avatar Emmanuil Chatzipetru Committed by Greg Kroah-Hartman

staging: olpc_dcon: olpc_dcon: Fix open parenthesis alignment.

This issue is caught by checkpatch.pl and is related to the following
warning:
	- CHECK: Alignment should match open parenthesis
Signed-off-by: default avatarEmmanuil Chatzipetru <chatzi.emanuel@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cee9ba1c
...@@ -81,7 +81,7 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init) ...@@ -81,7 +81,7 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
if (ver < 0xdc02) { if (ver < 0xdc02) {
dev_err(&dcon->client->dev, dev_err(&dcon->client->dev,
"DCON v1 is unsupported, giving up..\n"); "DCON v1 is unsupported, giving up..\n");
rc = -ENODEV; rc = -ENODEV;
goto err; goto err;
} }
...@@ -90,7 +90,7 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init) ...@@ -90,7 +90,7 @@ static int dcon_hw_init(struct dcon_priv *dcon, int is_init)
dcon_write(dcon, 0x3a, 0xc040); dcon_write(dcon, 0x3a, 0xc040);
dcon_write(dcon, DCON_REG_MEM_OPT_A, 0x0000); /* clear option bits */ dcon_write(dcon, DCON_REG_MEM_OPT_A, 0x0000); /* clear option bits */
dcon_write(dcon, DCON_REG_MEM_OPT_A, dcon_write(dcon, DCON_REG_MEM_OPT_A,
MEM_DLL_CLOCK_DELAY | MEM_POWER_DOWN); MEM_DLL_CLOCK_DELAY | MEM_POWER_DOWN);
dcon_write(dcon, DCON_REG_MEM_OPT_B, MEM_SOFT_RESET); dcon_write(dcon, DCON_REG_MEM_OPT_B, MEM_SOFT_RESET);
/* Colour swizzle, AA, no passthrough, backlight */ /* Colour swizzle, AA, no passthrough, backlight */
...@@ -261,14 +261,14 @@ static bool dcon_blank_fb(struct dcon_priv *dcon, bool blank) ...@@ -261,14 +261,14 @@ static bool dcon_blank_fb(struct dcon_priv *dcon, bool blank)
dcon->ignore_fb_events = true; dcon->ignore_fb_events = true;
err = fb_blank(dcon->fbinfo, err = fb_blank(dcon->fbinfo,
blank ? FB_BLANK_POWERDOWN : FB_BLANK_UNBLANK); blank ? FB_BLANK_POWERDOWN : FB_BLANK_UNBLANK);
dcon->ignore_fb_events = false; dcon->ignore_fb_events = false;
unlock_fb_info(dcon->fbinfo); unlock_fb_info(dcon->fbinfo);
console_unlock(); console_unlock();
if (err) { if (err) {
dev_err(&dcon->client->dev, "couldn't %sblank framebuffer\n", dev_err(&dcon->client->dev, "couldn't %sblank framebuffer\n",
blank ? "" : "un"); blank ? "" : "un");
return false; return false;
} }
return true; return true;
...@@ -293,7 +293,7 @@ static void dcon_source_switch(struct work_struct *work) ...@@ -293,7 +293,7 @@ static void dcon_source_switch(struct work_struct *work)
pr_info("dcon_source_switch to CPU\n"); pr_info("dcon_source_switch to CPU\n");
/* Enable the scanline interrupt bit */ /* Enable the scanline interrupt bit */
if (dcon_write(dcon, DCON_REG_MODE, if (dcon_write(dcon, DCON_REG_MODE,
dcon->disp_mode | MODE_SCAN_INT)) dcon->disp_mode | MODE_SCAN_INT))
pr_err("couldn't enable scanline interrupt!\n"); pr_err("couldn't enable scanline interrupt!\n");
else else
/* Wait up to one second for the scanline interrupt */ /* Wait up to one second for the scanline interrupt */
...@@ -646,7 +646,7 @@ static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -646,7 +646,7 @@ static int dcon_probe(struct i2c_client *client, const struct i2c_device_id *id)
dcon, &dcon_bl_ops, &dcon_bl_props); dcon, &dcon_bl_ops, &dcon_bl_props);
if (IS_ERR(dcon->bl_dev)) { if (IS_ERR(dcon->bl_dev)) {
dev_err(&client->dev, "cannot register backlight dev (%ld)\n", dev_err(&client->dev, "cannot register backlight dev (%ld)\n",
PTR_ERR(dcon->bl_dev)); PTR_ERR(dcon->bl_dev));
dcon->bl_dev = NULL; dcon->bl_dev = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment