From patchwork Thu Jan 9 12:51:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Anthony Olech (Opensource)" X-Patchwork-Id: 3460081 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BD4EEC02DC for ; Thu, 9 Jan 2014 12:59:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1772820123 for ; Thu, 9 Jan 2014 12:59:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E533420121 for ; Thu, 9 Jan 2014 12:59:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751690AbaAIM7d (ORCPT ); Thu, 9 Jan 2014 07:59:33 -0500 Received: from mail1.bemta3.messagelabs.com ([195.245.230.175]:58309 "EHLO mail1.bemta3.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751321AbaAIM7d (ORCPT ); Thu, 9 Jan 2014 07:59:33 -0500 X-Greylist: delayed 391 seconds by postgrey-1.27 at vger.kernel.org; Thu, 09 Jan 2014 07:59:32 EST Received: from [85.158.137.19:26985] by server-15.bemta-3.messagelabs.com id BE/0F-11556-AAB9EC25; Thu, 09 Jan 2014 12:52:58 +0000 X-Env-Sender: anthony.olech.opensource@diasemi.com X-Msg-Ref: server-9.tower-39.messagelabs.com!1389271977!16114668!1 X-Originating-IP: [82.210.246.133] X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27473 invoked from network); 9 Jan 2014 12:52:58 -0000 Received: from mailrelay1.diasemi.com (HELO NB-EX-CASHUB01.diasemi.com) (82.210.246.133) by server-9.tower-39.messagelabs.com with AES128-SHA encrypted SMTP; 9 Jan 2014 12:52:58 -0000 Received: from mailrelay1.diasemi.com (10.1.17.243) by NB-EX-CASHUB01.diasemi.com (10.1.16.140) with Microsoft SMTP Server id 14.2.309.2; Thu, 9 Jan 2014 13:52:57 +0100 Received: from swsrvapps-02.lan (Not Verified[10.20.27.23]) by mailrelay1.diasemi.com with ESMTP Gateway id ; Thu, 09 Jan 2014 13:52:57 +0100 Received: from swsrvapps-02.lan (localhost [127.0.0.1]) by swsrvapps-02.lan (8.14.4/8.14.4/Debian-2ubuntu2) with ESMTP id s09CquE6042763; Thu, 9 Jan 2014 12:52:56 GMT Received: (from aolech@localhost) by swsrvapps-02.lan (8.14.4/8.14.4/Submit) id s09CqsOr042762; Thu, 9 Jan 2014 12:52:54 GMT Message-ID: <201401091252.s09CqsOr042762@swsrvapps-02.lan> X-Authentication-Warning: swsrvapps-02.lan: aolech set sender to anthony.olech.opensource@diasemi.com using -f From: Anthony Olech Date: Thu, 9 Jan 2014 12:51:37 +0000 Subject: [PATCH V1] input: use device managed memory in da9052 touchscreen driver To: Dmitry Torokhov CC: , , Huqiu Liu , David Dajun Chen MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The touchscreen component driver for the da9052/3 Dialog PMICs is changed to use device managed memory allocation. This results in simpler error paths as failures in the probe() function do not require explicit calls to free the devm_... allocated memory. The allocation functions used in this driver are: devm_kzalloc() devm_input_allocate_device() devm_request_threaded_irq() Suggested-by: Huqiu Liu Signed-off-by: Anthony Olech --- This patch is relative to linux-next repository tag next-20140109 Many thanks to Huqiu Liu who instigated this patch. drivers/input/touchscreen/da9052_tsi.c | 62 ++++++++++++++++---------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/drivers/input/touchscreen/da9052_tsi.c b/drivers/input/touchscreen/da9052_tsi.c index ab64d58..dcc4cf1 100644 --- a/drivers/input/touchscreen/da9052_tsi.c +++ b/drivers/input/touchscreen/da9052_tsi.c @@ -233,18 +233,30 @@ static int da9052_ts_probe(struct platform_device *pdev) struct da9052_tsi *tsi; struct input_dev *input_dev; int error; + int pdown_irq; + int ready_irq; da9052 = dev_get_drvdata(pdev->dev.parent); if (!da9052) return -EINVAL; - tsi = kzalloc(sizeof(struct da9052_tsi), GFP_KERNEL); - input_dev = input_allocate_device(); - if (!tsi || !input_dev) { - error = -ENOMEM; - goto err_free_mem; - } + pdown_irq = regmap_irq_get_virq(da9052->irq_data, DA9052_IRQ_PENDOWN); + if (pdown_irq < 0) + return pdown_irq; + + ready_irq = regmap_irq_get_virq(da9052->irq_data, DA9052_IRQ_TSIREADY); + if (ready_irq < 0) + return ready_irq; + + tsi = devm_kzalloc(&pdev->dev, sizeof(struct da9052_tsi), GFP_KERNEL); + if (!tsi) + return -ENOMEM; + + input_dev = devm_input_allocate_device(&pdev->dev); + if (!input_dev) + return -ENOMEM; + platform_set_drvdata(pdev, tsi); tsi->da9052 = da9052; tsi->dev = input_dev; tsi->stopped = true; @@ -274,20 +286,24 @@ static int da9052_ts_probe(struct platform_device *pdev) /* Disable ADC */ da9052_ts_adc_toggle(tsi, false); - error = da9052_request_irq(tsi->da9052, DA9052_IRQ_PENDOWN, - "pendown-irq", da9052_ts_pendwn_irq, tsi); + error = devm_request_threaded_irq(&pdev->dev, pdown_irq, + NULL, da9052_ts_pendwn_irq, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + "pendown-irq", tsi); if (error) { dev_err(tsi->da9052->dev, "Failed to register PENDWN IRQ: %d\n", error); - goto err_free_mem; + return error; } - error = da9052_request_irq(tsi->da9052, DA9052_IRQ_TSIREADY, - "tsiready-irq", da9052_ts_datardy_irq, tsi); + error = devm_request_threaded_irq(&pdev->dev, ready_irq, + NULL, da9052_ts_datardy_irq, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + "tsiready-irq", tsi); if (error) { dev_err(tsi->da9052->dev, "Failed to register TSIRDY IRQ :%d\n", error); - goto err_free_pendwn_irq; + return error; } /* Mask PEN_DOWN and TSI_READY events */ @@ -296,25 +312,13 @@ static int da9052_ts_probe(struct platform_device *pdev) error = da9052_configure_tsi(tsi); if (error) - goto err_free_datardy_irq; + return error; error = input_register_device(tsi->dev); if (error) - goto err_free_datardy_irq; - - platform_set_drvdata(pdev, tsi); + return error; return 0; - -err_free_datardy_irq: - da9052_free_irq(tsi->da9052, DA9052_IRQ_TSIREADY, tsi); -err_free_pendwn_irq: - da9052_free_irq(tsi->da9052, DA9052_IRQ_PENDOWN, tsi); -err_free_mem: - kfree(tsi); - input_free_device(input_dev); - - return error; } static int da9052_ts_remove(struct platform_device *pdev) @@ -323,12 +327,6 @@ static int da9052_ts_remove(struct platform_device *pdev) da9052_reg_write(tsi->da9052, DA9052_LDO9_REG, 0x19); - da9052_free_irq(tsi->da9052, DA9052_IRQ_TSIREADY, tsi); - da9052_free_irq(tsi->da9052, DA9052_IRQ_PENDOWN, tsi); - - input_unregister_device(tsi->dev); - kfree(tsi); - return 0; }