Re: [PATCH] input: egalax_ts: remove bogus OF dependency

[Dmitry Torokhov]

On Tue, Apr 23, 2013 at 02:09:17PM +0300, Artem Bityutskiy wrote:
> There are platforms using this driver which do not have OF. However, commit
> ae495e844a77344fdaedbb2ad97d925d096e9f0d added a Kconfig dependency on OF and
> broke OF-less setups.
> 
> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@xxxxxxxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx [v3.7+]
> ---
>  drivers/input/touchscreen/Kconfig     |    2 +-
>  drivers/input/touchscreen/egalax_ts.c |    2 ++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
> index 515cfe7..d53b0d6 100644
> --- a/drivers/input/touchscreen/Kconfig
> +++ b/drivers/input/touchscreen/Kconfig
> @@ -227,7 +227,7 @@ config TOUCHSCREEN_EETI
>  
>  config TOUCHSCREEN_EGALAX
>  	tristate "EETI eGalax multi-touch panel support"
> -	depends on I2C && OF
> +	depends on I2C

No, because egalax_wake_up_device() needs OF data and with !CONFIG_OF
you'll end up using stubs, the wakeup will fail and the touchscreen will
fail probe.

It wasn't tested, was it?

Thanks.

>  	help
>  	  Say Y here to enable support for I2C connected EETI
>  	  eGalax multi-touch panels.
> diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c
> index 17c9097..b984cfc 100644
> --- a/drivers/input/touchscreen/egalax_ts.c
> +++ b/drivers/input/touchscreen/egalax_ts.c
> @@ -287,10 +287,12 @@ static int egalax_ts_resume(struct device *dev)
>  
>  static SIMPLE_DEV_PM_OPS(egalax_ts_pm_ops, egalax_ts_suspend, egalax_ts_resume);
>  
> +#ifdef CONFIG_OF
>  static struct of_device_id egalax_ts_dt_ids[] = {
>  	{ .compatible = "eeti,egalax_ts" },
>  	{ /* sentinel */ }
>  };
> +#endif
>  
>  static struct i2c_driver egalax_ts_driver = {
>  	.driver = {
> -- 
> 1.7.7
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/