Messages in this thread Patch in this message | | | From | Murilo Opsfelder Araujo <> | Subject | [PATCH 1/2] staging: olpc_dcon: check for CONFIG_OLPC before calling olpc_board_at_least() | Date | Thu, 15 Jan 2015 23:54:59 -0200 |
| |
The following error messages are thrown by sparse when CONFIG_OLPC is not defined:
drivers/staging/olpc_dcon/olpc_dcon.c:147:17: error: undefined identifier 'olpc_board_at_least' drivers/staging/olpc_dcon/olpc_dcon.c:208:14: error: undefined identifier 'olpc_board_at_least'
This patch fixes these errors.
Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> --- drivers/staging/olpc_dcon/olpc_dcon.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index 6a9a881..3708f1e 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c @@ -144,7 +144,9 @@ power_up: } if (x < 0) { pr_err("unable to stabilize dcon's smbus, reasserting power and praying.\n"); +#ifdef CONFIG_OLPC BUG_ON(olpc_board_at_least(olpc_board(0xc2))); +#endif pm = 0; olpc_ec_cmd(EC_DCON_POWER_MODE, &pm, 1, NULL, 0); msleep(100); @@ -205,8 +207,10 @@ static void dcon_sleep(struct dcon_priv *dcon, bool sleep) if (dcon->asleep == sleep) return; +#ifdef CONFIG_OLPC if (!olpc_board_at_least(olpc_board(0xc2))) return; +#endif if (sleep) { u8 pm = 0; @@ -795,11 +799,14 @@ struct i2c_driver dcon_driver = { static int __init olpc_dcon_init(void) { +#ifdef CONFIG_OLPC #ifdef CONFIG_FB_OLPC_DCON_1_5 /* XO-1.5 */ if (olpc_board_at_least(olpc_board(0xd0))) pdata = &dcon_pdata_xo_1_5; #endif +#endif + #ifdef CONFIG_FB_OLPC_DCON_1 if (!pdata) pdata = &dcon_pdata_xo_1; -- 2.1.0
| |