Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756226AbbHDMxK (ORCPT ); Tue, 4 Aug 2015 08:53:10 -0400 Received: from mail1.bemta3.messagelabs.com ([195.245.230.173]:48201 "EHLO mail1.bemta3.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755867AbbHDMxI convert rfc822-to-8bit (ORCPT ); Tue, 4 Aug 2015 08:53:08 -0400 X-Env-Sender: stwiss.opensource@diasemi.com X-Msg-Ref: server-5.tower-38.messagelabs.com!1438692775!3762576!1 X-Originating-IP: [94.185.165.51] X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked From: "Opensource [Steve Twiss]" To: Vaishali Thakkar CC: Dmitry Torokhov , "linux-input@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Support Opensource Subject: RE: [PATCH] Input: da9052_onkey: Convert to managed resources Thread-Topic: [PATCH] Input: da9052_onkey: Convert to managed resources Thread-Index: AQHQyBfVsaQlXpQHGkiqjW0bslRvDJ371L4g Date: Tue, 4 Aug 2015 12:52:53 +0000 Message-ID: <6ED8E3B22081A4459DAC7699F3695FB7014B2605BA@SW-EX-MBX02.diasemi.com> References: <20150727025616.GA4227@vaishali-Ideapad-Z570> In-Reply-To: <20150727025616.GA4227@vaishali-Ideapad-Z570> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.20.26.77] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2395 Lines: 77 On 27 July 2015 03:56, Vaishali Thakkar wrote: > Subject: [PATCH] Input: da9052_onkey: Convert to managed resources > > Use managed resource functions devm_input_allocate_device and > devm_kzalloc. To be compatible with the change, replace various > gotos by direct returns and drop unneeded labels. > > Signed-off-by: Vaishali Thakkar > --- > drivers/input/misc/da9052_onkey.c | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/drivers/input/misc/da9052_onkey.c > b/drivers/input/misc/da9052_onkey.c > index 266e07f..3243fe9 100644 > --- a/drivers/input/misc/da9052_onkey.c > +++ b/drivers/input/misc/da9052_onkey.c > @@ -84,12 +84,11 @@ static int da9052_onkey_probe(struct > platform_device *pdev) > return -EINVAL; > } > > - onkey = kzalloc(sizeof(*onkey), GFP_KERNEL); > - input_dev = input_allocate_device(); > + onkey = devm_kzalloc(&pdev->dev, sizeof(*onkey), GFP_KERNEL); > + input_dev = devm_input_allocate_device(&pdev->dev); > if (!onkey || !input_dev) { > dev_err(&pdev->dev, "Failed to allocate memory\n"); > - error = -ENOMEM; > - goto err_free_mem; > + return -ENOMEM; > } > > onkey->input = input_dev; > @@ -108,7 +107,7 @@ static int da9052_onkey_probe(struct > platform_device *pdev) > if (error < 0) { > dev_err(onkey->da9052->dev, > "Failed to register ONKEY IRQ: %d\n", error); > - goto err_free_mem; > + return error; > } > > error = input_register_device(onkey->input); > @@ -124,9 +123,6 @@ static int da9052_onkey_probe(struct > platform_device *pdev) > err_free_irq: > da9052_free_irq(onkey->da9052, DA9052_IRQ_NONKEY, onkey); > cancel_delayed_work_sync(&onkey->work); > -err_free_mem: > - input_free_device(input_dev); > - kfree(onkey); > > return error; > } > @@ -138,9 +134,6 @@ static int da9052_onkey_remove(struct > platform_device *pdev) > da9052_free_irq(onkey->da9052, DA9052_IRQ_NONKEY, onkey); > cancel_delayed_work_sync(&onkey->work); > > - input_unregister_device(onkey->input); > - kfree(onkey); > - > return 0; > } > > -- > 1.9.1 Acked-by: Steve Twiss -- 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/