From patchwork Thu Nov 22 12:16:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Terje Bergstrom X-Patchwork-Id: 201175 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 D9C992C008D for ; Fri, 23 Nov 2012 07:01:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965041Ab2KVUBd (ORCPT ); Thu, 22 Nov 2012 15:01:33 -0500 Received: from hqemgate04.nvidia.com ([216.228.121.35]:16274 "EHLO hqemgate04.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965293Ab2KVUBb (ORCPT ); Thu, 22 Nov 2012 15:01:31 -0500 Received: from hqnvupgp06.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Thu, 22 Nov 2012 04:13:00 -0800 Received: from hqemhub03.nvidia.com ([172.17.108.22]) by hqnvupgp06.nvidia.com (PGP Universal service); Thu, 22 Nov 2012 04:13:26 -0800 X-PGP-Universal: processed; by hqnvupgp06.nvidia.com on Thu, 22 Nov 2012 04:13:26 -0800 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQEMHUB03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.279.1; Thu, 22 Nov 2012 04:13:26 -0800 Received: from thelma.nvidia.com (Not Verified[172.16.212.77]) by hqnvemgw02.nvidia.com with MailMarshal (v6,7,2,8378) id ; Thu, 22 Nov 2012 04:13:26 -0800 Received: from tbergstrom-desktop.Nvidia.com (dhcp-10-21-25-183.nvidia.com [10.21.25.183]) by thelma.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id qAMCDHnu026299; Thu, 22 Nov 2012 04:13:25 -0800 (PST) From: Terje Bergstrom To: CC: Arto Merilainen , Terje Bergstrom Subject: [PATCH 4/6] gpu: drm: tegra: Free platform data on remove Date: Thu, 22 Nov 2012 14:16:52 +0200 Message-ID: <1353586614-7308-5-git-send-email-tbergstrom@nvidia.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1353586614-7308-1-git-send-email-tbergstrom@nvidia.com> References: <1353586614-7308-1-git-send-email-tbergstrom@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Arto Merilainen Platform data was not freed in device removal. This patch adds missing devm_kfree() calls. Change-Id: Id00fd1940e786dbc80c7ac5a1bd4d6a4c18720a1 Signed-off-by: Arto Merilainen Signed-off-by: Terje Bergstrom --- drivers/gpu/drm/tegra/dc.c | 3 +++ drivers/gpu/drm/tegra/dsi.c | 3 +++ drivers/gpu/drm/tegra/hdmi.c | 3 +++ drivers/gpu/drm/tegra/tvo.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 5ccb809..b9e5a79 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -818,6 +818,9 @@ static int tegra_dc_remove(struct platform_device *pdev) clk_disable_unprepare(dc->clk); + platform_set_drvdata(pdev, NULL); + devm_kfree(&pdev->dev, dc); + return 0; } diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index 4f4c709..bba1c61 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -149,6 +149,9 @@ static int tegra_dsi_remove(struct platform_device *pdev) return err; } + platform_set_drvdata(pdev, NULL); + devm_kfree(&pdev->dev, dsi); + return 0; } diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index b2b8e58..72032e8 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1312,6 +1312,9 @@ static int tegra_hdmi_remove(struct platform_device *pdev) clk_unprepare(hdmi->clk_parent); clk_unprepare(hdmi->clk); + platform_set_drvdata(pdev, NULL); + devm_kfree(&pdev->dev, hdmi); + return 0; } diff --git a/drivers/gpu/drm/tegra/tvo.c b/drivers/gpu/drm/tegra/tvo.c index 01ac356..c6219b3 100644 --- a/drivers/gpu/drm/tegra/tvo.c +++ b/drivers/gpu/drm/tegra/tvo.c @@ -159,6 +159,9 @@ static int tegra_tvo_remove(struct platform_device *pdev) return err; } + platform_set_drvdata(pdev, NULL); + devm_kfree(&pdev->dev, tvo); + return 0; }