From patchwork Wed Oct 9 10:52:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 3008181 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BB8D99F243 for ; Wed, 9 Oct 2013 10:52:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAD972017B for ; Wed, 9 Oct 2013 10:52:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E02A92015F for ; Wed, 9 Oct 2013 10:52:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757217Ab3JIKwu (ORCPT ); Wed, 9 Oct 2013 06:52:50 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:56227 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105Ab3JIKw1 (ORCPT ); Wed, 9 Oct 2013 06:52:27 -0400 Received: by mail-ee0-f46.google.com with SMTP id c13so305820eek.5 for ; Wed, 09 Oct 2013 03:52:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:content-type; bh=MZo9jjpPrKJ4lWW14HuibbKCfpaOLD9skSpWGzNLXI4=; b=H9X3li3zz3a65pRqlrDEvFBEQlbrbOrImC+wcN5vvYsL71kTUcLf6vfMWACT+85gUb Yb+FXW3kyMvYun9XU44wAdp55BfmQmky43miY9sI7GVkZPMAN48z6BSG1vxIVwhi5DlB CSLLkz08t/KlPjQP1bKl7i86dYHrZzt2r5d0wTGPWsq1TVy26vnMtuvdaXkUgOC16x93 6u6WHO7EskaidsfncAAOtG0BccrT1YnlVDxcAS8Q5Kxx8gS9CtvD79vjSpabUaxnSUnC mSuRK6jq7kY6uA27mzUUied6xaP2tSQj7fcgGl91fFESwQV+ydYYwm5kjAj8XbtlKFVG /zdA== X-Gm-Message-State: ALoCoQmUOqqmHMiPDnKcRblo9wGG5yRUvYc5DmC3vsptV714ZviMqOidVSvXO5Kk0O+0mIv+OU3C X-Received: by 10.14.45.70 with SMTP id o46mr10637645eeb.19.1381315946242; Wed, 09 Oct 2013 03:52:26 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id d8sm87336961eeh.8.1969.12.31.16.00.00 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 09 Oct 2013 03:52:25 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Cc: Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org Subject: [PATCH v2 2/3] video: xilinxfb: Use devm_kzalloc instead of kzalloc Date: Wed, 9 Oct 2013 12:52:13 +0200 Message-Id: <748c16093663172918a90a53dc472cb8beb584ca.1381315928.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <631df9a44b366af4129d00f1d4e1d3baad7d4903.1381315928.git.michal.simek@xilinx.com> References: <631df9a44b366af4129d00f1d4e1d3baad7d4903.1381315928.git.michal.simek@xilinx.com> In-Reply-To: <631df9a44b366af4129d00f1d4e1d3baad7d4903.1381315928.git.michal.simek@xilinx.com> References: <631df9a44b366af4129d00f1d4e1d3baad7d4903.1381315928.git.michal.simek@xilinx.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00, MIME_HEADER_CTYPE_ONLY, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, T_TVD_MIME_NO_HEADERS,UNPARSEABLE_RELAY autolearn=ham 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 Simplify driver probe and release function. Signed-off-by: Michal Simek Reviewed-by: Jingoo Han --- Changes in v2: Rebased on git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git for-next drivers/video/xilinxfb.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -- 1.8.2.3 diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index d12345f..98c7a6f 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c @@ -368,8 +368,6 @@ err_fbmem: devm_iounmap(dev, drvdata->regs); err_region: - kfree(drvdata); - return rc; } @@ -402,8 +400,6 @@ static int xilinxfb_release(struct device *dev) dcr_unmap(drvdata->dcr_host, drvdata->dcr_len); #endif - kfree(drvdata); - return 0; } @@ -423,7 +419,7 @@ static int xilinxfb_of_probe(struct platform_device *pdev) pdata = xilinx_fb_default_pdata; /* Allocate the driver data region */ - drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL); + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) { dev_err(&pdev->dev, "Couldn't allocate device private record\n"); return -ENOMEM; @@ -451,7 +447,6 @@ static int xilinxfb_of_probe(struct platform_device *pdev) drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len); if (!DCR_MAP_OK(drvdata->dcr_host)) { dev_err(&op->dev, "invalid DCR address\n"); - kfree(drvdata); return -ENODEV; } }