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

Commit a144428c authored by Chun Zhang's avatar Chun Zhang Committed by Gerrit - the friendly Code Review server
Browse files

input: ft5x06: add support when CONFIG_PM is not defined 



When CONFIG_PM is not defined, there are some compilation errors,
because it introduces undeclared touch suspend and resume function.

  This patch is propagated from 3.10 kernel
    commit: 53cdd29716aa0ebb781f81e35b65b6efe7842c43
    input: ft5x06: add support when CONFIG_PM is not defined

Change-Id: I869bd41270ea240c671e5478126a61d4ff2088dc
Signed-off-by: default avatarChun Zhang <chunz@codeaurora.org>
parent 4e8b58e9

drivers/input/touchscreen/ft5x06_ts.c

+21 −9
Original line number Diff line number Diff line
@@ -578,6 +578,26 @@ static int ft5x06_ts_resume(struct device *dev) 
	return 0;

}



static const struct dev_pm_ops ft5x06_ts_pm_ops = {

#if (!defined(CONFIG_FB) && !defined(CONFIG_HAS_EARLYSUSPEND))

	.suspend = ft5x06_ts_suspend,

	.resume = ft5x06_ts_resume,

#endif

};



#else

static int ft5x06_ts_suspend(struct device *dev)

{

	return 0;

}



static int ft5x06_ts_resume(struct device *dev)

{

	return 0;

}



#endif



#if defined(CONFIG_FB)

static int fb_notifier_callback(struct notifier_block *self,

				 unsigned long event, void *data)
@@ -618,14 +638,6 @@ static void ft5x06_ts_late_resume(struct early_suspend *handler) 
}

#endif



static const struct dev_pm_ops ft5x06_ts_pm_ops = {

#if (!defined(CONFIG_FB) && !defined(CONFIG_HAS_EARLYSUSPEND))

	.suspend = ft5x06_ts_suspend,

	.resume = ft5x06_ts_resume,

#endif

};

#endif



static int ft5x06_auto_cal(struct i2c_client *client)

{

	struct ft5x06_ts_data *data = i2c_get_clientdata(client);
@@ -885,7 +897,7 @@ static int ft5x06_fw_upgrade(struct device *dev, bool force) 
	}



	if (fw->size < FT_FW_MIN_SIZE || fw->size > FT_FW_MAX_SIZE) {

		dev_err(dev, "Invalid firmware size (%d)\n", fw->size);

		dev_err(dev, "Invalid firmware size (%zu)\n", fw->size);

		rc = -EIO;

		goto rel_fw;

	}