Move input device initialization to its own helper function.
This is in preparation of a future patch that makes input device
conditional on the device not being in its bootloader.

Signed-off-by: Daniel Kurtz <djku...@chromium.org>
---
 drivers/input/touchscreen/atmel_mxt_ts.c | 91 ++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c 
b/drivers/input/touchscreen/atmel_mxt_ts.c
index 84f0408..9afc26e 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1111,52 +1111,23 @@ static void mxt_input_close(struct input_dev *dev)
        mxt_stop(data);
 }
 
-static int mxt_probe(struct i2c_client *client,
-               const struct i2c_device_id *id)
+static int mxt_input_dev_create(struct mxt_data *data)
 {
-       const struct mxt_platform_data *pdata = client->dev.platform_data;
-       struct mxt_data *data;
        struct input_dev *input_dev;
        int error;
        unsigned int num_mt_slots;
 
-       if (!pdata)
-               return -EINVAL;
-
-       data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL);
-       if (!data) {
-               dev_err(&client->dev, "Failed to allocate memory\n");
+       data->input_dev = input_dev = input_allocate_device();
+       if (!input_dev)
                return -ENOMEM;
-       }
-
-       input_dev = input_allocate_device();
-       if (!input_dev) {
-               dev_err(&client->dev, "Failed to allocate memory\n");
-               error = -ENOMEM;
-               goto err_free_mem;
-       }
 
        input_dev->name = "Atmel maXTouch Touchscreen";
-       snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0",
-                client->adapter->nr, client->addr);
        input_dev->phys = data->phys;
-
        input_dev->id.bustype = BUS_I2C;
-       input_dev->dev.parent = &client->dev;
+       input_dev->dev.parent = &data->client->dev;
        input_dev->open = mxt_input_open;
        input_dev->close = mxt_input_close;
 
-       data->client = client;
-       data->input_dev = input_dev;
-       data->pdata = pdata;
-       data->irq = client->irq;
-
-       mxt_calc_resolution(data);
-
-       error = mxt_initialize(data);
-       if (error)
-               goto err_free_mem;
-
        __set_bit(EV_ABS, input_dev->evbit);
        __set_bit(EV_KEY, input_dev->evbit);
        __set_bit(BTN_TOUCH, input_dev->keybit);
@@ -1172,10 +1143,8 @@ static int mxt_probe(struct i2c_client *client,
        /* For multi touch */
        num_mt_slots = data->T9_reportid_max - data->T9_reportid_min + 1;
        error = input_mt_init_slots(input_dev, num_mt_slots, 0);
-       if (error) {
-               input_free_device(input_dev);
-               goto err_free_object;
-       }
+       if (error)
+               goto err_free_device;
 
        input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
                             0, MXT_MAX_AREA, 0, 0);
@@ -1187,14 +1156,54 @@ static int mxt_probe(struct i2c_client *client,
                             0, 255, 0, 0);
 
        input_set_drvdata(input_dev, data);
-       i2c_set_clientdata(client, data);
 
        error = input_register_device(input_dev);
-       if (error) {
-               input_free_device(input_dev);
-               goto err_free_object;
+       if (error)
+               goto err_free_device;
+
+       return 0;
+
+err_free_device:
+       input_free_device(data->input_dev);
+       data->input_dev = NULL;
+       return error;
+}
+
+static int __devinit mxt_probe(struct i2c_client *client,
+               const struct i2c_device_id *id)
+{
+       const struct mxt_platform_data *pdata = client->dev.platform_data;
+       struct mxt_data *data;
+       int error;
+
+       if (!pdata)
+               return -EINVAL;
+
+       data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL);
+       if (!data) {
+               dev_err(&client->dev, "Failed to allocate memory\n");
+               return -ENOMEM;
        }
 
+       snprintf(data->phys, sizeof(data->phys), "i2c-%u-%04x/input0",
+                client->adapter->nr, client->addr);
+
+       data->client = client;
+       i2c_set_clientdata(client, data);
+
+       data->pdata = pdata;
+       data->irq = client->irq;
+
+       mxt_calc_resolution(data);
+
+       error = mxt_initialize(data);
+       if (error)
+               goto err_free_mem;
+
+       error = mxt_input_dev_create(data);
+       if (error)
+               goto err_free_object;
+
        error = request_threaded_irq(client->irq, NULL, mxt_interrupt,
                                     pdata->irqflags | IRQF_ONESHOT,
                                     client->name, data);
-- 
1.8.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to