From patchwork Wed Jul 22 09:34:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 6841531 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3B5D7C05AC for ; Wed, 22 Jul 2015 09:38:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5568920737 for ; Wed, 22 Jul 2015 09:38:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2630620729 for ; Wed, 22 Jul 2015 09:38:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933863AbbGVJih (ORCPT ); Wed, 22 Jul 2015 05:38:37 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:36178 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933649AbbGVJif (ORCPT ); Wed, 22 Jul 2015 05:38:35 -0400 Received: by pdjr16 with SMTP id r16so138536148pdj.3 for ; Wed, 22 Jul 2015 02:38:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UpWJ1ICKASh15xVQ+vsuFJ8B1iWBWmDSODDyYyOPECw=; b=aRs1X675uW3MCFUk00P/n7FyTreErk1wc3+LOJ0ZNrcXNI+I6nYJSsvqxjRZhOhzxp I+Xlr1sCxQAguT81kDl/O8TOmyxCJsi8Oi2K8H7z2F/wyOkcMSUAIcOexHQIUZ7nSsOq 5Nekc8fxLr97TTe+NIs5asjN3L9RZYdiQ0uAsLHDXVXh4ew8WANKm6pMXasiUek71Vue alwhdOa2llQBLs7mYsJ/Pbvd7a8W7v8LnpYGbnbtxWfZ1yNKCPY52wIaNPwHLUk8hikK e9ARQ3+IYy7jVF/Pnq656xF7SNqyR82Ndmzvigqs22IwtTHjm6mUMQ544HA0b6JI7L/C 9XGA== X-Gm-Message-State: ALoCoQljpeHmr0N/Ap+k8SeMaI77TrKTkFdeWCkXYHg8dkQIMdqc0T9bE3qYZjS4XyNgSHTdan5Q X-Received: by 10.66.251.202 with SMTP id zm10mr821003pac.87.1437557915221; Wed, 22 Jul 2015 02:38:35 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by smtp.gmail.com with ESMTPSA id zj15sm2225019pab.1.2015.07.22.02.38.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jul 2015 02:38:34 -0700 (PDT) From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Cc: Vaibhav Hiremath , Sangbeom Kim , Krzysztof Kozlowski , Michael Turquette , Stephen Boyd , linux-kernel@vger.kernel.org (open list:SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS), linux-samsung-soc@vger.kernel.org (open list:SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS), linux-clk@vger.kernel.org (open list:COMMON CLK FRAMEWORK) Subject: [PATCH] clk: s2mps11: Use kcalloc instead of kzalloc for array allocation Date: Wed, 22 Jul 2015 15:04:53 +0530 Message-Id: <1437557693-29433-1-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-8.1 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 This patch cleans up the driver for, - Use devm_kcalloc varient instead of devm_kzalloc for array allocation. - clk_prepare/unprepare, remove "ret" variable as it is not required - use __exit for cleanup function As I am referring this driver as a reference for my 88pm800 clk driver, applying same changes here as well. Signed-off-by: Vaibhav Hiremath Tested-by: Anand Moon Reviewed-by: Krzysztof Kozlowski --- Since I do not have platform to test, it would be helpful if someone tests it for me. I have build tested it. drivers/clk/clk-s2mps11.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c index 9b13a30..e17c66a 100644 --- a/drivers/clk/clk-s2mps11.c +++ b/drivers/clk/clk-s2mps11.c @@ -58,21 +58,17 @@ static struct s2mps11_clk *to_s2mps11_clk(struct clk_hw *hw) static int s2mps11_clk_prepare(struct clk_hw *hw) { struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); - int ret; - ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, + return regmap_update_bits(s2mps11->iodev->regmap_pmic, s2mps11->reg, s2mps11->mask, s2mps11->mask); - - return ret; } static void s2mps11_clk_unprepare(struct clk_hw *hw) { struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); - int ret; - ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, s2mps11->reg, + regmap_update_bits(s2mps11->iodev->regmap_pmic, s2mps11->reg, s2mps11->mask, ~s2mps11->mask); } @@ -186,15 +182,15 @@ static int s2mps11_clk_probe(struct platform_device *pdev) struct clk_init_data *clks_init; int i, ret = 0; - s2mps11_clks = devm_kzalloc(&pdev->dev, sizeof(*s2mps11_clk) * - S2MPS11_CLKS_NUM, GFP_KERNEL); + s2mps11_clks = devm_kcalloc(&pdev->dev, S2MPS11_CLKS_NUM, + sizeof(*s2mps11_clk), GFP_KERNEL); if (!s2mps11_clks) return -ENOMEM; s2mps11_clk = s2mps11_clks; - clk_table = devm_kzalloc(&pdev->dev, sizeof(struct clk *) * - S2MPS11_CLKS_NUM, GFP_KERNEL); + clk_table = devm_kcalloc(&pdev->dev, S2MPS11_CLKS_NUM, + sizeof(struct clk *), GFP_KERNEL); if (!clk_table) return -ENOMEM; @@ -322,7 +318,7 @@ static int __init s2mps11_clk_init(void) } subsys_initcall(s2mps11_clk_init); -static void __init s2mps11_clk_cleanup(void) +static void __exit s2mps11_clk_cleanup(void) { platform_driver_unregister(&s2mps11_clk_driver); }