Merge "input: ft5x06: add support when CONFIG_PM is not defined" (34052f87) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/input/touchscreen/ft5x06_ts.c

+24 −11

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;
		}
		@@ -1542,7 +1554,8 @@ static int ft5x06_ts_probe(struct i2c_client *client,
		data->family_id = pdata->family_id;

		err = request_threaded_irq(client->irq, NULL,
		ft5x06_ts_interrupt, pdata->irqflags,
		ft5x06_ts_interrupt,
		pdata->irqflags \| IRQF_ONESHOT,
		client->dev.driver->name, data);
		if (err) {
		dev_err(&client->dev, "request irq failed\n");