From patchwork Sun Mar 26 14:41:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 96011 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp853258qgd; Sun, 26 Mar 2017 07:42:37 -0700 (PDT) X-Received: by 10.98.159.149 with SMTP id v21mr20405561pfk.57.1490539357195; Sun, 26 Mar 2017 07:42:37 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w190si9604700pgd.276.2017.03.26.07.42.36; Sun, 26 Mar 2017 07:42:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751488AbdCZOmf (ORCPT + 15 others); Sun, 26 Mar 2017 10:42:35 -0400 Received: from mail-wr0-f182.google.com ([209.85.128.182]:34287 "EHLO mail-wr0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbdCZOmc (ORCPT ); Sun, 26 Mar 2017 10:42:32 -0400 Received: by mail-wr0-f182.google.com with SMTP id l43so22365878wre.1 for ; Sun, 26 Mar 2017 07:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zgw36ZeWDK4UUhIsCalRw4jp69aawMmx6vrmU/7MIxw=; b=fHDt8UD3dcjlcb00B0Q6bLbIYY0p6GkMXF+29vFDtzj+c6pwabVxbq0WX7T06jFrw3 euw8bx4tF2oXTW0HX/whty9KR6138NIYzG7o0xMubCceT9sl80EKCHnz9FoEdZxigZkm p6o/OR52sing0+KOzejgXupiB6YalQpvMHndQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zgw36ZeWDK4UUhIsCalRw4jp69aawMmx6vrmU/7MIxw=; b=IQRElkMZsV6gvhlbDjBy4kbn+DfZeq9eY1BRtttEQck9ci4KKIw6O71rAaALffS2uj qqYrvSEuKIrpmA+jzytjteDzxYwN1ecND7qFG0jFz5danO4Tplh5f6y43XjJ+4byAA4f KjjCVbsOaPDuRw9kGQRWdAejTL1QN5gZj6kSu8jqsMplytOGoneOUK877hReV3ZbBxR8 WEPbWKnuBXeqAWw+C/7Tela0vrdgfU4EhclQHTI8UOcUuKdZTjSHNdbjiKGhjKvHbhM4 +U8QiUF6YZl5t0ciWlQF5DxuG3o+NQGMXL4VPdz9oGRGKfvtcocTnK593h1lBC1+g1hG pB9Q== X-Gm-Message-State: AFeK/H2I5l9XSayWvglXxKtMiIEPS461ARPprY8F8PyAvVeXJwbnniTislk95MZPb12aojI9 X-Received: by 10.28.19.6 with SMTP id 6mr5708439wmt.96.1490539350771; Sun, 26 Mar 2017 07:42:30 -0700 (PDT) Received: from localhost.localdomain (li1529-187.members.linode.com. [139.162.244.187]) by smtp.gmail.com with ESMTPSA id l90sm10619516wmi.25.2017.03.26.07.42.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Mar 2017 07:42:29 -0700 (PDT) From: Leo Yan To: Russell King , Dmitry Torokhov , Alessandro Zummo , Alexandre Belloni , Linus Walleij , Baptiste Reynal , Alex Williamson , Jaroslav Kysela , Takashi Iwai , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, alsa-devel@alsa-project.org Cc: Leo Yan Subject: [PATCH 1/5] Input: ambakmi - Convert to use devm_*() Date: Sun, 26 Mar 2017 22:41:50 +0800 Message-Id: <1490539314-9681-2-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490539314-9681-1-git-send-email-leo.yan@linaro.org> References: <1490539314-9681-1-git-send-email-leo.yan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert driver to use devm_*() APIs so rely on driver model core layer to manage resources. This eliminates error path boilerplate and makes code neat. This patch also fixes the memory leakage for 'kmi->io' when remove module. Signed-off-by: Leo Yan --- drivers/input/serio/ambakmi.c | 44 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) -- 2.7.4 diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index c6606ca..d4814be 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c @@ -112,19 +112,11 @@ static int amba_kmi_probe(struct amba_device *dev, { struct amba_kmi_port *kmi; struct serio *io; - int ret; - - ret = amba_request_regions(dev, NULL); - if (ret) - return ret; - - kmi = kzalloc(sizeof(struct amba_kmi_port), GFP_KERNEL); - io = kzalloc(sizeof(struct serio), GFP_KERNEL); - if (!kmi || !io) { - ret = -ENOMEM; - goto out; - } + kmi = devm_kzalloc(&dev->dev, sizeof(*kmi), GFP_KERNEL); + io = devm_kzalloc(&dev->dev, sizeof(*io), GFP_KERNEL); + if (!kmi || !io) + return -ENOMEM; io->id.type = SERIO_8042; io->write = amba_kmi_write; @@ -136,31 +128,19 @@ static int amba_kmi_probe(struct amba_device *dev, io->dev.parent = &dev->dev; kmi->io = io; - kmi->base = ioremap(dev->res.start, resource_size(&dev->res)); - if (!kmi->base) { - ret = -ENOMEM; - goto out; - } + kmi->base = devm_ioremap_resource(&dev->dev, &dev->res); + if (IS_ERR(kmi->base)) + return PTR_ERR(kmi->base); - kmi->clk = clk_get(&dev->dev, "KMIREFCLK"); - if (IS_ERR(kmi->clk)) { - ret = PTR_ERR(kmi->clk); - goto unmap; - } + kmi->clk = devm_clk_get(&dev->dev, "KMIREFCLK"); + if (IS_ERR(kmi->clk)) + return PTR_ERR(kmi->clk); kmi->irq = dev->irq[0]; amba_set_drvdata(dev, kmi); serio_register_port(kmi->io); return 0; - - unmap: - iounmap(kmi->base); - out: - kfree(kmi); - kfree(io); - amba_release_regions(dev); - return ret; } static int amba_kmi_remove(struct amba_device *dev) @@ -168,10 +148,6 @@ static int amba_kmi_remove(struct amba_device *dev) struct amba_kmi_port *kmi = amba_get_drvdata(dev); serio_unregister_port(kmi->io); - clk_put(kmi->clk); - iounmap(kmi->base); - kfree(kmi); - amba_release_regions(dev); return 0; }