Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754226AbaKSIjO (ORCPT ); Wed, 19 Nov 2014 03:39:14 -0500 Received: from mail-pd0-f178.google.com ([209.85.192.178]:41183 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753902AbaKSIjK (ORCPT ); Wed, 19 Nov 2014 03:39:10 -0500 From: Dudley Du To: dmitry.torokhov@gmail.com, rydberg@euromail.se Cc: Dudley Du , bleung@google.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v11 02/19] input: cyapa: add device resource management infrastructure support Date: Wed, 19 Nov 2014 16:37:34 +0800 Message-Id: <1416386271-28167-3-git-send-email-dudley.dulixin@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416386271-28167-1-git-send-email-dudley.dulixin@gmail.com> References: <1416386271-28167-1-git-send-email-dudley.dulixin@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove cyapa_remove() method, add cyapa_open() and cyapa_close() methods for input interface, also modified together with driver's memory and IRQ resource allocations to support device resource management infrastructure to reduce the mistakes of resource management. TEST=test on Chromebooks. Signed-off-by: Dudley Du --- drivers/input/mouse/cyapa.c | 77 +++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c index c35f398..06c94a3 100644 --- a/drivers/input/mouse/cyapa.c +++ b/drivers/input/mouse/cyapa.c @@ -753,6 +753,22 @@ static u8 cyapa_check_adapter_functionality(struct i2c_client *client) return ret; } +static int cyapa_open(struct input_dev *input) +{ + struct cyapa *cyapa = input_get_drvdata(input); + struct i2c_client *client = cyapa->client; + + enable_irq(client->irq); + return 0; +} + +static void cyapa_close(struct input_dev *input) +{ + struct cyapa *cyapa = input_get_drvdata(input); + + disable_irq(cyapa->client->irq); +} + static int cyapa_create_input_dev(struct cyapa *cyapa) { struct device *dev = &cyapa->client->dev; @@ -762,7 +778,7 @@ static int cyapa_create_input_dev(struct cyapa *cyapa) if (!cyapa->physical_size_x || !cyapa->physical_size_y) return -EINVAL; - input = cyapa->input = input_allocate_device(); + input = cyapa->input = devm_input_allocate_device(dev); if (!input) { dev_err(dev, "allocate memory for input device failed\n"); return -ENOMEM; @@ -775,6 +791,9 @@ static int cyapa_create_input_dev(struct cyapa *cyapa) input->id.product = 0; /* means any product in eventcomm. */ input->dev.parent = &cyapa->client->dev; + input->open = cyapa_open; + input->close = cyapa_close; + input_set_drvdata(input, cyapa); __set_bit(EV_ABS, input->evbit); @@ -807,21 +826,17 @@ static int cyapa_create_input_dev(struct cyapa *cyapa) if (error) { dev_err(dev, "allocate memory for MT slots failed, %d\n", error); - goto err_free_device; + return error; } /* Register the device in input subsystem */ error = input_register_device(input); if (error) { dev_err(dev, "input device register failed, %d\n", error); - goto err_free_device; + return error; } - return 0; -err_free_device: - input_free_device(input); - cyapa->input = NULL; - return error; + return 0; } static int cyapa_probe(struct i2c_client *client, @@ -838,7 +853,7 @@ static int cyapa_probe(struct i2c_client *client, return -EIO; } - cyapa = kzalloc(sizeof(struct cyapa), GFP_KERNEL); + cyapa = devm_kzalloc(dev, sizeof(struct cyapa), GFP_KERNEL); if (!cyapa) return -ENOMEM; @@ -855,51 +870,45 @@ static int cyapa_probe(struct i2c_client *client, error = cyapa_check_is_operational(cyapa); if (error) { dev_err(dev, "device not operational, %d\n", error); - goto err_mem_free; - } - - error = cyapa_create_input_dev(cyapa); - if (error) { - dev_err(dev, "create input_dev instance failed, %d\n", error); - goto err_mem_free; + return error; } error = cyapa_set_power_mode(cyapa, PWR_MODE_FULL_ACTIVE); if (error) { dev_err(dev, "set active power failed, %d\n", error); - goto err_unregister_device; + return error; } cyapa->irq = client->irq; - error = request_threaded_irq(cyapa->irq, - NULL, - cyapa_irq, - IRQF_TRIGGER_FALLING | IRQF_ONESHOT, - "cyapa", - cyapa); + error = devm_request_threaded_irq(dev, + cyapa->irq, + NULL, + cyapa_irq, + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + "cyapa", + cyapa); if (error) { dev_err(dev, "IRQ request failed: %d\n, ", error); - goto err_unregister_device; + return error; } + /* Disable IRQ until the device is opened. */ + disable_irq(client->irq); - return 0; - -err_unregister_device: - input_unregister_device(cyapa->input); -err_mem_free: - kfree(cyapa); + error = cyapa_create_input_dev(cyapa); + if (error) { + dev_err(dev, "create input_dev instance failed, %d\n", error); + return error; + } - return error; + return 0; } static int cyapa_remove(struct i2c_client *client) { struct cyapa *cyapa = i2c_get_clientdata(client); - free_irq(cyapa->irq, cyapa); - input_unregister_device(cyapa->input); + disable_irq(cyapa->irq); cyapa_set_power_mode(cyapa, PWR_MODE_OFF); - kfree(cyapa); return 0; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/