Re: [PATCH] input: st1232.c: Add devicetree attributes
From: Dmitry Torokhov <hidden>
Date: 2015-11-17 18:28:38
Also in:
linux-arm-kernel, linux-devicetree
Possibly related (same subject, not in this thread)
- 2015-11-16 · Re: [PATCH] input: st1232.c: Add devicetree attributes · Rob Herring <robh@kernel.org>
- 2015-11-15 · [PATCH] input: st1232.c: Add devicetree attributes · Sander Vermin <hidden>
Hi Sander, On Sun, Nov 15, 2015 at 05:20:47PM +0100, Sander Vermin wrote:
-static int __maybe_unused st1232_ts_suspend(struct device *dev) +#ifdef CONFIG_PM_SLEEP
Why?
quoted hunk
+static int st1232_ts_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); - struct st1232_ts_data *ts = i2c_get_clientdata(client); + struct st1232_data *data = i2c_get_clientdata(client); - if (device_may_wakeup(&client->dev)) { - enable_irq_wake(client->irq); - } else { - disable_irq(client->irq); - st1232_ts_power(ts, false); - } + mutex_lock(&data->input_dev->mutex); + if (data->input_dev->users) + st1232_stop(data->input_dev); + mutex_unlock(&data->input_dev->mutex); return 0; } -static int __maybe_unused st1232_ts_resume(struct device *dev) +static int st1232_ts_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); - struct st1232_ts_data *ts = i2c_get_clientdata(client); + struct st1232_data *data = i2c_get_clientdata(client); - if (device_may_wakeup(&client->dev)) { - disable_irq_wake(client->irq); - } else { - st1232_ts_power(ts, true); - enable_irq(client->irq); - } + mutex_lock(&data->input_dev->mutex); + if (data->input_dev->users) + st1232_start(data->input_dev); + mutex_unlock(&data->input_dev->mutex); return 0; } +#endif static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops, st1232_ts_suspend, st1232_ts_resume);@@ -282,13 +436,12 @@ static const struct i2c_device_id st1232_ts_id[] = { }; MODULE_DEVICE_TABLE(i2c, st1232_ts_id); -#ifdef CONFIG_OF
Why?
quoted hunk
-static const struct of_device_id st1232_ts_dt_ids[] = { +static const struct of_device_id st1232_of_match[] = { { .compatible = "sitronix,st1232", }, { } }; -MODULE_DEVICE_TABLE(of, st1232_ts_dt_ids); -#endif +MODULE_DEVICE_TABLE(of, st1232_of_match); + static struct i2c_driver st1232_ts_driver = { .probe = st1232_ts_probe,@@ -296,13 +449,14 @@ static struct i2c_driver st1232_ts_driver = { .id_table = st1232_ts_id, .driver = { .name = ST1232_TS_NAME, - .of_match_table = of_match_ptr(st1232_ts_dt_ids), + .owner = THIS_MODULE, + .of_match_table = st1232_of_match,
Why? There seems many intermingled changes that are done to the driver, you need to split them apart and explain why they are needed. Thanks! -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html