From patchwork Tue Jan 7 06:45:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 307549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5B68C2C00AC for ; Tue, 7 Jan 2014 18:44:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754813AbaAGHoK (ORCPT ); Tue, 7 Jan 2014 02:44:10 -0500 Received: from [207.46.163.27] ([207.46.163.27]:43910 "EHLO co9outboundpool.messaging.microsoft.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754732AbaAGHoK (ORCPT ); Tue, 7 Jan 2014 02:44:10 -0500 Received: from mail12-co9-R.bigfish.com (10.236.132.243) by CO9EHSOBE002.bigfish.com (10.236.130.65) with Microsoft SMTP Server id 14.1.225.22; Tue, 7 Jan 2014 07:42:59 +0000 Received: from mail12-co9 (localhost [127.0.0.1]) by mail12-co9-R.bigfish.com (Postfix) with ESMTP id 098073002BC; Tue, 7 Jan 2014 07:42:59 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah1fc6hzz1de098h8275bh1de097hz2dh2a8h839he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h2327h2336h1155h) Received: from mail12-co9 (localhost.localdomain [127.0.0.1]) by mail12-co9 (MessageSwitch) id 1389080577257561_5186; Tue, 7 Jan 2014 07:42:57 +0000 (UTC) Received: from CO9EHSMHS019.bigfish.com (unknown [10.236.132.241]) by mail12-co9.bigfish.com (Postfix) with ESMTP id 36757200047; Tue, 7 Jan 2014 07:42:57 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS019.bigfish.com (10.236.130.29) with Microsoft SMTP Server (TLS) id 14.16.227.3; Tue, 7 Jan 2014 07:42:56 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.3.158.2; Tue, 7 Jan 2014 07:42:55 +0000 Received: from rock.am.freescale.net (rock.ap.freescale.net [10.193.20.106]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s077gmVf017528; Tue, 7 Jan 2014 00:42:49 -0700 From: Xiubo Li To: CC: , , , Xiubo Li Subject: [PATCH v2] pwm: core: Use devm_kcalloc instead of kzalloc Date: Tue, 7 Jan 2014 14:45:47 +0800 Message-ID: <1389077147-15487-1-git-send-email-Li.Xiubo@freescale.com> X-Mailer: git-send-email 1.8.0 MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-FOPE-CONNECTOR: Id%0$Dn%FREESCALE.MAIL.ONMICROSOFT.COM$RO%1$TLS%0$FQDN%$TlsDn% Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Use devm_kcalloc instead of kzalloc to free automatically and make the cleanup paths simpler and the code slightly shorter. Signed-off-by: Xiubo Li --- Changed in v2: - Use devm_kcalloc instead of devm_kzalloc. Changed in v1: - Use devm_kzalloc instead of kzalloc. drivers/pwm/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 2ca9504..75220e8 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -80,7 +80,6 @@ static void free_pwms(struct pwm_chip *chip) bitmap_clear(allocated_pwms, chip->base, chip->npwm); - kfree(chip->pwms); chip->pwms = NULL; } @@ -245,7 +244,8 @@ int pwmchip_add(struct pwm_chip *chip) if (ret < 0) goto out; - chip->pwms = kzalloc(chip->npwm * sizeof(*pwm), GFP_KERNEL); + chip->pwms = devm_kcalloc(chip->dev, chip->npwm, + sizeof(*pwm), GFP_KERNEL); if (!chip->pwms) { ret = -ENOMEM; goto out;