From patchwork Tue Aug 28 09:33:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 10578093 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4571217DB for ; Tue, 28 Aug 2018 09:34:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35BF128869 for ; Tue, 28 Aug 2018 09:34:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27E6828ABE; Tue, 28 Aug 2018 09:34:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFDCE28869 for ; Tue, 28 Aug 2018 09:34:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C0936B456F; Tue, 28 Aug 2018 05:34:13 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 718DD6B4570; Tue, 28 Aug 2018 05:34:13 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 607A66B4571; Tue, 28 Aug 2018 05:34:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by kanga.kvack.org (Postfix) with ESMTP id 018FD6B456F for ; Tue, 28 Aug 2018 05:34:13 -0400 (EDT) Received: by mail-wr1-f71.google.com with SMTP id w6-v6so831305wrc.22 for ; Tue, 28 Aug 2018 02:34:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=1rAADFiEcrgAP/MWUhEq9f5JToaQRAnXC+gfalAjE3k=; b=nuJmewImrHt22JCr5WFVtK/0Z5uzHdYVmSHR3LH7Ob8EBT5nTGFHZnAQa41jSZ2v9i qt61BjuOPO6+DoSTt8z5B+vER6j3uM3NmcUimD5q1bfxbZGUiZVA45fcB7hXMZdvilrf MfAx90QZpxCFHcunBqUUa5kFjEwjuF0u6Gtq8ON9y2WdhNxyiUZxoUtZU8Pl//g6QleM SR9nyf8oV7nE1WEPeedHOcgPIt/pS4cj+65JE7hvGDbTs74tJihlj9Pc/a+lXG1AX3hv Yl5pjb+Rv4+4iXgCwbFMvXf7yUOPjHclUpvBm1EZ5XV9ooa7JJxRomUEAGWmrmN3inhP 9l3Q== X-Gm-Message-State: APzg51AqhthWj8GZ/ZWgLPG8iZS27JXm1N8Q0BLaEb4xb/bp7y2r1vxj NWlWToaAR22oUPQ/0uzZgW3ILQY/5mkMW3EJqgot+LKWny80+0YUqYGefMpLxm1/TOkYLUDP7r9 XcPdx3N+8ehW2X+UKerjqOCrcOGyEEhwlh1lj/yxoMxwDLV/rkxQ4eTUdQUYwLFRWFf6aYrVhhI QC0xd/f0pQGbYkzcLq57vZbTfaa5KJlIsHjwafUqSFP1pNFzJezemQTvug2Y0rAVdjuv+X6+fqU 0xrV7K37PmMEqUBTMnNvgsGVqE3EyKfOhVUv08w6UnA41CXN4mcPZ+ZWqnWkTUfFgmcZMJUpIyX n8ar/+9VEoWN4yCugcyR5z8sW85qxl4X0Nod6jw4QE0RymRuOo0NZjBOmS59cIL8xLh4XW05CL2 1 X-Received: by 2002:a1c:2108:: with SMTP id h8-v6mr783462wmh.108.1535448852445; Tue, 28 Aug 2018 02:34:12 -0700 (PDT) X-Received: by 2002:a1c:2108:: with SMTP id h8-v6mr783441wmh.108.1535448851707; Tue, 28 Aug 2018 02:34:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535448851; cv=none; d=google.com; s=arc-20160816; b=EwjsgKsEABP7ZPiA5etOFRvHe0msLoWx77LLfVb0qFhInzkXFVsfkSTgZihdoodA8N Pjyk5YszuRTMMuAIx5qf15hSbMAiRRISbuzTdxQRnWoEEJXj8hSBXW5cbexp0VskL+XI eVF/noAIIAsOL6SrEb3GcL0b8UpNgj47PjabeedfTMF/g6NKOfGdhNCnN47P/xWQRGOd XRZ5zhdlZzv5YP23n88ER1q7HDxyJ9jNterKe7zhLNMMkY1CRBscFmveUqcs794HelHY PtBYmiZip/SQotZJXd4qySirSfmSBr3tyxbxEFl6NZKtFv+3rm1YEenV3SQzB2PUTDOM DVtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=1rAADFiEcrgAP/MWUhEq9f5JToaQRAnXC+gfalAjE3k=; b=ZTt8NUYejgL8zVf2IqkghsxMDPf3KCc2XOZmd1CznE1CLroZaoh4kghRc7ucl2u8tp HqGPIu6U+QzlzTCVt6DDCCnDSjbyIxxCIA2OfEyk4s+xpJVglA7VRE0iZaVUl88UDYdx 9yaBJmzv4q70DyaVCaE35hXAH+5G9aHkkTmEwOR2jQT8MzH43VSEB/tHODKGglcL1xKZ R3AXa8QdRCCC9MX//EovfTGAEAs6AZzL4CujJthpoM/5eMuh1lE6PVkBA0eMu9c5UhY+ 4DBiQy5E0mODz/di54eXPrfpbNNmpvC4Q0RiZWbmGApCcRLokX2LkWf+uYa3+SA2jhwO BcLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20150623.gappssmtp.com header.s=20150623 header.b="p//iCCA1"; spf=neutral (google.com: 209.85.220.65 is neither permitted nor denied by best guess record for domain of brgl@bgdev.pl) smtp.mailfrom=brgl@bgdev.pl Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x18-v6sor234709wrt.8.2018.08.28.02.34.11 for (Google Transport Security); Tue, 28 Aug 2018 02:34:11 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.65 is neither permitted nor denied by best guess record for domain of brgl@bgdev.pl) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20150623.gappssmtp.com header.s=20150623 header.b="p//iCCA1"; spf=neutral (google.com: 209.85.220.65 is neither permitted nor denied by best guess record for domain of brgl@bgdev.pl) smtp.mailfrom=brgl@bgdev.pl DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1rAADFiEcrgAP/MWUhEq9f5JToaQRAnXC+gfalAjE3k=; b=p//iCCA1MuEaI2HpuhoGbJeHcq2jmfgPJ3XDrG/O5LZF3RXf2wsubecp6Goz7f0o79 LzT65i1lmWoaar1tB5UxTxjHYLeLVHrvQscb6ydeLJHCsQEC69i39aaxHAOKVE1CKahY 0m9Ms8Rx7z5+D6L0OSVn9vhev1b0VzkzfM2hrtrjE+pygIscDuYgdSobWncG3TQ7++De sD6EF5qddYdMx2C+2m+idpSPuNykz0yd5T2H8HNxVmT7wG1hwYOhg8Dyg+E1NitcTEm1 xEWToxnbd0MTBOykkCMbKgEEowFIq/mwptYz6+dx0HFbepSNxia95yLEO1YoSRRJiJ0/ KiIg== X-Google-Smtp-Source: ANB0Vdb1z1itApQb6iLVseTRPyo4shStOLvpCOq0LLmwi14Xk+YVt9l+6hKfzi1quea3dB05Pl4LFQ== X-Received: by 2002:adf:9d1c:: with SMTP id k28-v6mr604790wre.104.1535448851396; Tue, 28 Aug 2018 02:34:11 -0700 (PDT) Received: from brgl-bgdev.home ([2a01:cb1d:af:5b00:e837:b8d5:48c1:571b]) by smtp.gmail.com with ESMTPSA id l18-v6sm952276wru.75.2018.08.28.02.34.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 02:34:10 -0700 (PDT) From: Bartosz Golaszewski To: Michael Turquette , Stephen Boyd , Greg Kroah-Hartman , "Rafael J . Wysocki" , Arend van Spriel , Ulf Hansson , Bjorn Helgaas , Vivek Gautam , Robin Murphy , Joe Perches , Heikki Krogerus , Andrew Morton , Mike Rapoport , Michal Hocko , Al Viro , Jonathan Corbet , Roman Gushchin , Huang Ying , Kees Cook , Bjorn Andersson , Arnd Bergmann Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Bartosz Golaszewski Subject: [PATCH v2 4/4] clk: pmc-atom: use devm_kstrdup_const() Date: Tue, 28 Aug 2018 11:33:32 +0200 Message-Id: <20180828093332.20674-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180828093332.20674-1-brgl@bgdev.pl> References: <20180828093332.20674-1-brgl@bgdev.pl> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Use devm_kstrdup_const() in the pmc-atom driver. This mostly serves as an example of how to use this new routine to shrink driver code. While we're at it: replace a call to kcalloc() with devm_kcalloc(). Signed-off-by: Bartosz Golaszewski Reviewed-by: Stephen Boyd Reviewed-by: Bjorn Andersson --- drivers/clk/x86/clk-pmc-atom.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/clk/x86/clk-pmc-atom.c b/drivers/clk/x86/clk-pmc-atom.c index 08ef69945ffb..daa2192e6568 100644 --- a/drivers/clk/x86/clk-pmc-atom.c +++ b/drivers/clk/x86/clk-pmc-atom.c @@ -253,14 +253,6 @@ static void plt_clk_unregister_fixed_rate_loop(struct clk_plt_data *data, plt_clk_unregister_fixed_rate(data->parents[i]); } -static void plt_clk_free_parent_names_loop(const char **parent_names, - unsigned int i) -{ - while (i--) - kfree_const(parent_names[i]); - kfree(parent_names); -} - static void plt_clk_unregister_loop(struct clk_plt_data *data, unsigned int i) { @@ -286,8 +278,8 @@ static const char **plt_clk_register_parents(struct platform_device *pdev, if (!data->parents) return ERR_PTR(-ENOMEM); - parent_names = kcalloc(nparents, sizeof(*parent_names), - GFP_KERNEL); + parent_names = devm_kcalloc(&pdev->dev, nparents, + sizeof(*parent_names), GFP_KERNEL); if (!parent_names) return ERR_PTR(-ENOMEM); @@ -300,7 +292,8 @@ static const char **plt_clk_register_parents(struct platform_device *pdev, err = PTR_ERR(data->parents[i]); goto err_unreg; } - parent_names[i] = kstrdup_const(clks[i].name, GFP_KERNEL); + parent_names[i] = devm_kstrdup_const(&pdev->dev, + clks[i].name, GFP_KERNEL); } data->nparents = nparents; @@ -308,7 +301,6 @@ static const char **plt_clk_register_parents(struct platform_device *pdev, err_unreg: plt_clk_unregister_fixed_rate_loop(data, i); - plt_clk_free_parent_names_loop(parent_names, i); return ERR_PTR(err); } @@ -351,15 +343,12 @@ static int plt_clk_probe(struct platform_device *pdev) goto err_unreg_clk_plt; } - plt_clk_free_parent_names_loop(parent_names, data->nparents); - platform_set_drvdata(pdev, data); return 0; err_unreg_clk_plt: plt_clk_unregister_loop(data, i); plt_clk_unregister_parents(data); - plt_clk_free_parent_names_loop(parent_names, data->nparents); return err; }