From patchwork Thu Oct 10 06:30:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 3014241 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 73F739F245 for ; Thu, 10 Oct 2013 06:31:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA9D220142 for ; Thu, 10 Oct 2013 06:31:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CABB32013B for ; Thu, 10 Oct 2013 06:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754152Ab3JJGbN (ORCPT ); Thu, 10 Oct 2013 02:31:13 -0400 Received: from mail-ea0-f170.google.com ([209.85.215.170]:43817 "EHLO mail-ea0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539Ab3JJGae (ORCPT ); Thu, 10 Oct 2013 02:30:34 -0400 Received: by mail-ea0-f170.google.com with SMTP id h14so885835eak.15 for ; Wed, 09 Oct 2013 23:30:33 -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=Wk4Y4YU2ctQiQLC1IyWgBrz2jX057PNbuN12D81bPVg=; b=RpEXrJO913tipzuyIAr5ZFtcl6ZF5GyerlqeG5Si6FqnnDP06qF3n66FLXmEO55coN 7KJUzsNfIsQatKbGjjlqkLWTGbJZglUFRTaXMWeu6Gmr9ba/QjCjnn5uEomnklRBj/kO lXWZ+NwKB7vzC0OoyZzalUA8xAoMdcjZv80zkAA/nUsdc3s/KL6pKAt7V/hMIIg0qW8n xgSlFvlsVheXCtZshxcni/x2pqb0ZEgw4SenNpD0cgpuQYh5a4sQA3bwVu/o8BYoiEYQ 8oHpZYaeS48mA10qc43DicV4gvpGQNkT8xQW0Ct2I35GezuLWOhsvbFTBQRQav1qIxkl /sPQ== X-Gm-Message-State: ALoCoQnP6MIPKFg0f3IZw85vrnQijXDXY83rrSJBMvsVJfwjO7fNiPfDZ3bj6nS6ChE/olKn4i3N X-Received: by 10.14.5.3 with SMTP id 3mr11533094eek.49.1381386633187; Wed, 09 Oct 2013 23:30:33 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id f49sm97481700eec.7.1969.12.31.16.00.00 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Wed, 09 Oct 2013 23:30:32 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Cc: joe@perches.com, Jean-Christophe Plagniol-Villard , Tomi Valkeinen , linux-fbdev@vger.kernel.org Subject: [PATCH v3 2/3] video: xilinxfb: Use devm_kzalloc instead of kzalloc Date: Thu, 10 Oct 2013 08:30:21 +0200 Message-Id: X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <631df9a44b366af4129d00f1d4e1d3baad7d4903.1381386616.git.michal.simek@xilinx.com> References: <631df9a44b366af4129d00f1d4e1d3baad7d4903.1381386616.git.michal.simek@xilinx.com> In-Reply-To: <631df9a44b366af4129d00f1d4e1d3baad7d4903.1381386616.git.michal.simek@xilinx.com> References: <631df9a44b366af4129d00f1d4e1d3baad7d4903.1381386616.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=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 Simplify driver probe and release function. Signed-off-by: Michal Simek Reviewed-by: Jingoo Han --- Changes in v3: - Remove the unnecessary OOM message Changes in v2: - Rebased on git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git for-next drivers/video/xilinxfb.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- 1.8.2.3 diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index d12345f..c420328 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,11 +419,9 @@ 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); - if (!drvdata) { - dev_err(&pdev->dev, "Couldn't allocate device private record\n"); + drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) return -ENOMEM; - } /* * To check whether the core is connected directly to DCR or BUS @@ -451,7 +445,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; } }