Input: two merge window build fixes

Input: two merge window build fixes

[Arnd Bergmann]

Hi Dmitry,

I ran into two new build regressions in the input subsystem with
today's linux-next, maybe you can apply these fixes before sending
off the pull request for v4.7.

	Arnd

[PATCH 1/2] Input: atmel captouch depends on i2c
[PATCH 2/2] Input: migor-ts: mark PM functions as __maybe_unused

[PATCH 1/2] Input: atmel captouch depends on i2c

[Arnd Bergmann]

The newly added Atmal captouch driver fails to build when CONFIG_I2C
is disabled:

drivers/input/misc/atmel_captouch.c: In function 'atmel_read':
drivers/input/misc/atmel_captouch.c:115:8: error: implicit declaration of function 'i2c_transfer' [-Werror=implicit-function-declaration]

This adds an explicit Kconfig dependency to prevent the broken
configuration.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b06d43f7a3db ("Input: add Atmel Captouch Button driver")
---
 drivers/input/misc/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 9c3dfe79d4d4..27d6da0e354a 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -85,6 +85,7 @@ config INPUT_ARIZONA_HAPTICS
 config INPUT_ATMEL_CAPTOUCH
 	tristate "Atmel Capacitive Touch Button Driver"
 	depends on OF || COMPILE_TEST
+	depends on I2C
 	help
 	  Say Y here if an Atmel Capacitive Touch Button device which
 	  implements "captouch" protocol is connected to I2C bus. Typically
-- 
2.7.0

[PATCH 2/2] Input: migor-ts: mark PM functions as __maybe_unused

[Arnd Bergmann]

The migor touchscreen driver is now available for COMPILE_TEST,
so we run into a harmless randconfig warning on ARM when CONFIG_PM
is disabled:

drivers/input/touchscreen/migor_ts.c:216:12: error: 'migor_ts_resume' defined but not used [-Werror=unused-function]
drivers/input/touchscreen/migor_ts.c:205:12: error: 'migor_ts_suspend' defined but not used [-Werror=unused-function]

This shuts up the warning by marking the two functions as __maybe_unused.
We could do the same thing by adding an #ifdef, but this version is
more reliable.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/input/touchscreen/migor_ts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c
index e4b92c4cae3b..02fb11985819 100644
--- a/drivers/input/touchscreen/migor_ts.c
+++ b/drivers/input/touchscreen/migor_ts.c
@@ -202,7 +202,7 @@ static int migor_ts_remove(struct i2c_client *client)
 	return 0;
 }
 
-static int migor_ts_suspend(struct device *dev)
+static int __maybe_unused migor_ts_suspend(struct device *dev)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct migor_ts_priv *priv = i2c_get_clientdata(client);
@@ -213,7 +213,7 @@ static int migor_ts_suspend(struct device *dev)
 	return 0;
 }
 
-static int migor_ts_resume(struct device *dev)
+static int __maybe_unused migor_ts_resume(struct device *dev)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct migor_ts_priv *priv = i2c_get_clientdata(client);
-- 
2.7.0

Re: Input: two merge window build fixes

[Dmitry Torokhov]

On Thu, May 19, 2016 at 03:52:23PM +0200, Arnd Bergmann wrote:
> Hi Dmitry,
> 
> I ran into two new build regressions in the input subsystem with
> today's linux-next, maybe you can apply these fixes before sending
> off the pull request for v4.7.
> 
> 	Arnd
> 
> [PATCH 1/2] Input: atmel captouch depends on i2c
> [PATCH 2/2] Input: migor-ts: mark PM functions as __maybe_unused

Applied both, thank you Arnd.

-- 
Dmitry