From patchwork Fri Nov 20 08:14:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Ying X-Patchwork-Id: 7665001 Return-Path: X-Original-To: patchwork-dri-devel@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 63067BF90C for ; Fri, 20 Nov 2015 08:08:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8EADF20494 for ; Fri, 20 Nov 2015 08:08:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 617C720497 for ; Fri, 20 Nov 2015 08:08:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88EEC6EA4D; Fri, 20 Nov 2015 00:08:26 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0129.outbound.protection.outlook.com [207.46.100.129]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BA9E6EA4D for ; Fri, 20 Nov 2015 00:08:25 -0800 (PST) Received: from DM2PR03CA0022.namprd03.prod.outlook.com (10.141.96.21) by DM2PR0301MB1229.namprd03.prod.outlook.com (10.160.219.18) with Microsoft SMTP Server (TLS) id 15.1.325.17; Fri, 20 Nov 2015 08:08:23 +0000 Received: from BN1BFFO11FD052.protection.gbl (2a01:111:f400:7c10::1:173) by DM2PR03CA0022.outlook.office365.com (2a01:111:e400:2428::21) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Fri, 20 Nov 2015 08:08:22 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; linux.ie; dkim=none (message not signed) header.d=none; linux.ie; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD052.mail.protection.outlook.com (10.58.145.7) with Microsoft SMTP Server (TLS) id 15.1.325.5 via Frontend Transport; Fri, 20 Nov 2015 08:08:22 +0000 Received: from victor.ap.freescale.net (victor.ap.freescale.net [10.192.241.62]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tAK88EUR019182; Fri, 20 Nov 2015 01:08:20 -0700 From: Liu Ying To: Subject: [PATCH 4/5] drm/imx: ipuv3 plane: Use the helper ipu_plane_cleanup() in ipu_plane_destroy() Date: Fri, 20 Nov 2015 16:14:10 +0800 Message-ID: <1448007251-25591-4-git-send-email-Ying.Liu@freescale.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1448007251-25591-1-git-send-email-Ying.Liu@freescale.com> References: <1448007251-25591-1-git-send-email-Ying.Liu@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD052; 1:pszpFw4vh7jHGBSiO8o1WYJWEHWy/tSEFL/mSXhbp8+i3YeXM8PX4yJN2Hjc6Nfpd+2Yl2/UXKuQk0lyzU4v2W2OXFgc56EFcyyQu8mJ+5jTF0Awj2s11+ib8DuTWfYnmvmFcveERJY1ddiDStgocysPz5GfWD6wNA3p6pzACpn9e0lhiWMajaZDmRC3JhqTLKNsHP4KGfAqnxS+USFKkXwupypTT9pw8vpc2NftfKGmWo5wwJbE0rol2LeGdeu7gYh+BKq5ViRON1nmV3rd4PWlspc1B6iC+nIM9EeGn5/lZFUKGcNfUA9HQ/Jfdzpx6W4tg7SUyAUBA9Ac7OBA/0spStpirM9h6+eELzOggGf1B5vXTblOKjjJGs41Aa7SwIVsLnL49hAYyhDH6bV/Mw== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(69596002)(229853001)(586003)(19580405001)(92566002)(106466001)(104016004)(5003940100001)(5008740100001)(76176999)(6806005)(50466002)(50986999)(77096005)(85326001)(87936001)(11100500001)(19580395003)(36756003)(2950100001)(189998001)(2351001)(97736004)(86362001)(5001960100002)(48376002)(81156007)(5001920100001)(47776003)(110136002)(50226001)(5007970100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1229; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1229; 2:HfJ/6Pa3/PzkQosBcJV77enU8w7iMIaM15k5p5ZIWyF8qSMNpkrhaBg76fg3hH3PHGZFkMToz1dwUN59f2nEU2FurwVHDpy/5Ji+sXYeEQtZvhv7rT2SGysIO/HxQ3WZPT3c1Wzb3sMPgMnHEanjSl6fYjK/3eaRbFAslqoeYSI=; 3:7F06YpB8uWGB87Z1zb8oMnXNi1NpC0JBIvXjG++xTG1Qaa8i7h6PX+HKJq/xA4Mi7xLkF+Zg8li2wXyYZls/b0Y1oJ+kmuPxIGvMWOc6Ms6fR5khFFTl4AV85LJELE/6addC16pUZ7/XssQ8PaMk7gRQFvf3CxX85zweIsncD6YDWwB0z1WXDAH0r1M1BQCHJ4ZSQu97QfS2kSLI6shxRLZ2UL5jJT6HKXDIuKaL3J8=; 25:ZAyJ5LwAhexPRrXp2JQactq3vsjWh2vw8Na2tUO6EGGB0t7ntTfBWtoR5RDJs+M97FBi1BZE5uXG/m1zJsYjpfCuRJCd5FJUjekwFSmi3GceDXH9Gzw+L2Vzcqz1mxO136gLADPUSmWciAmrTyl03pu+TP73tEYxh+HxNOEInSxVNlLtDCfB/EX9uRE9BhSdsbDnlY324WaGq/5ftmx/SZznyIKJ1TMwr+18EaGjxf/Cml45k67oOpw9Lu4ZOrayWz2RspZWGZERHZDC6/tLqQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1229; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1229; 20:2Y5KRaPYqW6Ct25sdOPT8ci5EcuIsoMeBuQEQQ5chXLUA8UIeUZ/x++j79hnj+wu04FXxG1MrInuAgnVxQ7j0K6tTqc9EAkame2UB7JCLIFjHCzh3KnPfNScnRmCn7vlJYXE38wphenwdZpLF/7f4PZkd+ImICXPARFoEiMAO0YQ7uRlwvnfW61AZ4D15b6p5FsD1VcB+ux7W4kwIWajhhgV4ylxoqq7UfxyFfZfnj1pECGtJQ9wB7+0FxyVCkM9UZq8wBns0jwoTIkl6JtTAqgwcUoRAjt5wdSaU5Pra6nGaqfgDo911JIWL0n0Z2q2pOTOgzJWho1YGofTGMxRmNxtRqyJFSa82mjjG0+Znjc=; 4:zYFwDZQVnuWLj9G2WoZPksHZ7kVZEpRucFxMTAJe72ArvQ4AXaTCK37eLkfuLVauFQ4ssnPDLMIEccEsPNznpFO5fIf5Wg6AZ0Goe7EZpXhrhpZta0bC+DgVxwqhptlqtasUiWomqZKlwefC67PPfLcm5Sf27O6BTiVPHJ/3QKJweg1ziZMcM3Ra0KPSdo1c/vXuPQOPmcUR+7H11KSZU4QaGaC/SzcbHur4DewARS65wisRASwNl3uAwWSlaY90p+0tliYOH2Kj8iydFClc2QHESwYECOMuIRdIiP9LYStYMlHWEi+Fbv013RzGBRtRqzMSCb39uxYVTI2w2zdhALyfec3kBgkgTdO3ujkpH97WJEbbB2oVZ0CfpP04t+ZIw9gJhBPYhROeznT3LkrOYg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(10201501046)(3002001); SRVR:DM2PR0301MB1229; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1229; X-Forefront-PRVS: 07665BE9D1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1229; 23:GBahdOQi2CAk/rShv8B07dQhy/30kfMsfLCUYk3?= =?us-ascii?Q?FLPAJMeIF4UVTS0LAKdpM9emSqAzkbcYOFd1eptT8N8/ScEi+5MImePt+Arn?= =?us-ascii?Q?CKclDvNh30gjptMN8kRFO1IqfM35vRywl6A+PjjH9SlMgLDTltkbsQXMIJLI?= =?us-ascii?Q?gDkWY0/6RadNEb9mdk1YWk0+wwdL3shqQJQOF4nG/ZOP4JZWVMvGz1+HVdCu?= =?us-ascii?Q?YNHfaVxmjkKva8sXQNpEge7jUtWwTIqsLlJS9FYHW4tv43IPxBPEduPMY1JE?= =?us-ascii?Q?xWL65ff79ExV9Gz5nn/AFYGz+lcFiySY9PbApqApswgRsHmwIRXoFp6WZ6aq?= =?us-ascii?Q?3cCIVjzTjG5v+/vmLL8ID3vbr+kLyjKpCSG0oxPYmiW2r13ZEuCvMTyG7XlL?= =?us-ascii?Q?9l5Zz3E+6opGUL9XC36/0CFDcqz1Rg+S5JYMvsByz+/kDJitwGE6ElToZQbt?= =?us-ascii?Q?VlH8VSfYvejAIioOZRMPBAyEgRjkUWZ47KTNulfZIW/EKeNq+49tK0xonnYE?= =?us-ascii?Q?zutUcZ3amAZbzsoVzYhzcP/FzdTJdxSmlqlBEyD6BsH1IqBqxqX3Sb7BqeOc?= =?us-ascii?Q?M0QdCqLGG7A1yMf1gl77Ln1ITv/E34zvi0ZVAkapCGZlX8wp0Zu4TzlsD+DJ?= =?us-ascii?Q?VYUo6cstDzkw9Ltezmenv5CUb+GqA4i+jZjA46kk+YQRU80mkyOgx5Dc6mcc?= =?us-ascii?Q?ImQ5UJs6ErUnwGZGEghivsvjMicFpU0WfuACkNX/DgBpygoOrcQnXxRlL1Vv?= =?us-ascii?Q?RvcLH3T6G4NvlymQGahPjg3bcRumHB+Cs2grKBerDT0fCmsTQKbfoh28Vi+R?= =?us-ascii?Q?MSq8mCODmxLBbILZocc0YWjIIyqeeyqdR3pQ18s5SvhjoJkWBdEwWRQNd68g?= =?us-ascii?Q?mhn0iTXtYTzJEdNOjRMFfqjYckArJjJVzRYRmmFuEkI0++krvraTR8KIuovO?= =?us-ascii?Q?5TTj/wHZClcBWrX2/zZdnX+OVJV3zFUKEs/v8gRx6EEOmuPTIMU6Dw10psd6?= =?us-ascii?Q?tPHtNqbe+VH5CNDt5OwcuxlWw?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1229; 5:/acC5OTecSF0tARMrZWOT4i6eYwGOjfKLrl/wbU4Bzvzg6azne5iSViRthOxkn4YcRbJ4luuAh6Acv/xPWVidQKSZu237jJQvf/OfIZbvrzhltRf5wnPEdFpUZYH6/L1ltPCBG5szQoCbGM28H/8uw==; 24:l6/yuipCOVtYkev8DG6yRvImQV8/KFVjb1F4Jw8A7KrPE7V8tZpxq44vo93oSAPtbHxS6rWnynEbd0AMiYMl/M5U2LcIecQgMvJ9g83NAug=; 20:+xc4kA8r48MPyVav4jiUzoJ7r/DzwWKcvm8bUg3R09ABq3pWnLNogjgWvQJNLL+FA15Dz4yO9yoUbAID75hB0g== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2015 08:08:22.1986 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1229 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, 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 To reduce code duplication, we can use the helper ipu_plane_cleanup() in ipu_plane_destroy(). Signed-off-by: Liu Ying --- This patch applies to the imx-drm/fixes branch of Philipp Zabel's open git. drivers/gpu/drm/imx/ipuv3-plane.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index e60b382..b3ed207 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -369,8 +369,7 @@ static void ipu_plane_destroy(struct drm_plane *plane) DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); ipu_disable_plane(plane); - drm_plane_cleanup(plane); - kfree(ipu_plane); + ipu_plane_cleanup(ipu_plane); } static struct drm_plane_funcs ipu_plane_funcs = {