|
@@ -43,7 +43,6 @@ struct tps6507x_ts {
|
|
|
struct input_dev *input_dev;
|
|
|
struct device *dev;
|
|
|
char phys[32];
|
|
|
- struct workqueue_struct *wq;
|
|
|
struct delayed_work work;
|
|
|
unsigned polling; /* polling is active */
|
|
|
struct ts_event tc;
|
|
@@ -220,8 +219,8 @@ done:
|
|
|
poll = 1;
|
|
|
|
|
|
if (poll) {
|
|
|
- schd = queue_delayed_work(tsc->wq, &tsc->work,
|
|
|
- msecs_to_jiffies(tsc->poll_period));
|
|
|
+ schd = schedule_delayed_work(&tsc->work,
|
|
|
+ msecs_to_jiffies(tsc->poll_period));
|
|
|
if (schd)
|
|
|
tsc->polling = 1;
|
|
|
else {
|
|
@@ -303,7 +302,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
|
|
|
tsc->input_dev = input_dev;
|
|
|
|
|
|
INIT_DELAYED_WORK(&tsc->work, tps6507x_ts_handler);
|
|
|
- tsc->wq = create_workqueue("TPS6507x Touchscreen");
|
|
|
|
|
|
if (init_data) {
|
|
|
tsc->poll_period = init_data->poll_period;
|
|
@@ -325,8 +323,8 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
|
|
|
if (error)
|
|
|
goto err2;
|
|
|
|
|
|
- schd = queue_delayed_work(tsc->wq, &tsc->work,
|
|
|
- msecs_to_jiffies(tsc->poll_period));
|
|
|
+ schd = schedule_delayed_work(&tsc->work,
|
|
|
+ msecs_to_jiffies(tsc->poll_period));
|
|
|
|
|
|
if (schd)
|
|
|
tsc->polling = 1;
|
|
@@ -341,7 +339,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev)
|
|
|
|
|
|
err2:
|
|
|
cancel_delayed_work_sync(&tsc->work);
|
|
|
- destroy_workqueue(tsc->wq);
|
|
|
input_free_device(input_dev);
|
|
|
err1:
|
|
|
kfree(tsc);
|
|
@@ -357,7 +354,6 @@ static int __devexit tps6507x_ts_remove(struct platform_device *pdev)
|
|
|
struct input_dev *input_dev = tsc->input_dev;
|
|
|
|
|
|
cancel_delayed_work_sync(&tsc->work);
|
|
|
- destroy_workqueue(tsc->wq);
|
|
|
|
|
|
input_unregister_device(input_dev);
|
|
|
|