Revert "tp ct36x:reduce init time"

This reverts commit 175e2ce4f5fc0e809417aa9ef053c031d38be74d.

diff --git a/drivers/input/touchscreen/ct36x/ct36x_priv.h b/drivers/input/touchscreen/ct36x/ct36x_priv.h
index b9c20c05ba36a066ad10a6045e1e5b5ca3727b09..149105771565cc3ea1646f8cf8a8f95a4977dfa4 100755 (executable)
--- a/drivers/input/touchscreen/ct36x/ct36x_priv.h
+++ b/drivers/input/touchscreen/ct36x/ct36x_priv.h
@@ -68,7 +68,6 @@ struct ct36x_data{
        struct  tp_device  tp;
        struct ct36x_ops *ops;
        void *priv;
-       struct delayed_work ct36x_init_delayed_work;
 };
 
 static int i2c_master_normal_send(const struct i2c_client *client, const char *buf, int count, int scl_rate)

diff --git a/drivers/input/touchscreen/ct36x/ct36x_ts.c b/drivers/input/touchscreen/ct36x/ct36x_ts.c
index 32c99181f35b45156430828b8c8153a5e76ba5fe..4795854bb5c6ddee75278eca201cb9d12a5c26fd 100755 (executable)
--- a/drivers/input/touchscreen/ct36x/ct36x_ts.c
+++ b/drivers/input/touchscreen/ct36x/ct36x_ts.c
@@ -139,54 +139,6 @@ static void ct36x_ts_late_resume(struct tp_device *tp_d)
        enable_irq(ts->irq);
 }
 
-struct ct36x_data *ct36x_ts;
-
-static void ct36x_init_later_work(struct work_struct *work)
-{
-       int ret;
-       printk("ente ct36x_init_later_work==========\n");
-        //struct ct36x_data *ts = container_of(work, struct ct36x_data, work.work);
-          if(ct36x_ts->ops->init){
-               ret = ct36x_ts->ops->init(ct36x_ts);
-               if(ret < 0){
-                       dev_err(ct36x_ts->dev, "Failed to init ct36x chip\n");
-                       return ret;
-               }
-       }
-       //enable_irq(ct36x_ts->irq);
-       //ct36x_register_input(ct36x_ts);
-       
-               ct36x_ts->input = devm_input_allocate_device(&ct36x_ts->client->dev);
-               if(!ct36x_ts->input){
-                       ret = -ENODEV;
-                       dev_err(ct36x_ts->dev, "Failed to allocate input device\n");
-                       return ret;
-               }
-       
-               ct36x_ts->input->name = CT36X_NAME;
-               ct36x_ts->input->dev.parent = &ct36x_ts->client->dev;
-               set_bit(EV_ABS, ct36x_ts->input->evbit);
-               set_bit(INPUT_PROP_DIRECT, ct36x_ts->input->propbit);
-               input_mt_init_slots(ct36x_ts->input, ct36x_ts->point_num,0);
-               input_set_abs_params(ct36x_ts->input, ABS_MT_POSITION_X, 0, ct36x_ts->x_max, 0, 0);
-               input_set_abs_params(ct36x_ts->input, ABS_MT_POSITION_Y, 0, ct36x_ts->y_max, 0, 0);
-               input_set_abs_params(ct36x_ts->input, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
-               input_set_abs_params(ct36x_ts->input, ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0);
-       
-               ret = input_register_device(ct36x_ts->input);
-               if(ret < 0){
-                       dev_err(ct36x_ts->dev, "Failed to register input device\n");
-                       return ret;
-               }
-       
-#ifdef CONFIG_HAS_EARLYSUSPEND
-               ct36x_ts->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1;
-               ct36x_ts->early_suspend.suspend = ct36x_ts_early_suspend;
-               ct36x_ts->early_suspend.resume = ct36x_ts_late_resume;
-               register_early_suspend(&ct36x_ts->early_suspend);
-#endif
-               printk("finish ct36x_init_later_work==========\n");
-}
 
 static int ct36x_ts_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
@@ -285,9 +237,38 @@ static int ct36x_ts_probe(struct i2c_client *client, const struct i2c_device_id
                                        }
                        }
 
-       ct36x_ts = ts;
-       INIT_DELAYED_WORK(&ts->ct36x_init_delayed_work, ct36x_init_later_work);
-       schedule_delayed_work(&ts->ct36x_init_delayed_work, msecs_to_jiffies(500));
+
+
+       if(ts->ops->init){
+               ret = ts->ops->init(ts);
+               if(ret < 0){
+                       dev_err(ts->dev, "Failed to init ct36x chip\n");
+                       goto err_ct36x_init_chip;
+               }
+       }
+
+       ts->input = devm_input_allocate_device(&ts->client->dev);
+       if(!ts->input){
+               ret = -ENODEV;
+               dev_err(ts->dev, "Failed to allocate input device\n");
+               goto err_input_allocate_device;
+       }
+
+       ts->input->name = CT36X_NAME;
+       ts->input->dev.parent = &client->dev;
+       set_bit(EV_ABS, ts->input->evbit);
+       set_bit(INPUT_PROP_DIRECT, ts->input->propbit);
+       input_mt_init_slots(ts->input, ts->point_num,0);
+       input_set_abs_params(ts->input, ABS_MT_POSITION_X, 0, ts->x_max, 0, 0);
+       input_set_abs_params(ts->input, ABS_MT_POSITION_Y, 0, ts->y_max, 0, 0);
+       input_set_abs_params(ts->input, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
+       input_set_abs_params(ts->input, ABS_MT_WIDTH_MAJOR, 0, 255, 0, 0);
+
+       ret = input_register_device(ts->input);
+       if(ret < 0){
+               dev_err(ts->dev, "Failed to register input device\n");
+               goto err_input_register_devcie;
+       }
 
        
        ts->tp.tp_resume = ct36x_ts_late_resume;