From patchwork Fri Jun 14 18:05:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 2722881 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 EB6939F472 for ; Fri, 14 Jun 2013 18:06:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C2122037D for ; Fri, 14 Jun 2013 18:06:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF51720369 for ; Fri, 14 Jun 2013 18:06:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752684Ab3FNSGz (ORCPT ); Fri, 14 Jun 2013 14:06:55 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:42105 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752035Ab3FNSGy (ORCPT ); Fri, 14 Jun 2013 14:06:54 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOE00DZ6ABHB0P0@mailout1.samsung.com>; Sat, 15 Jun 2013 03:06:53 +0900 (KST) X-AuditID: cbfee61a-b7f3b6d000006edd-6c-51bb5bbdd279 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A2.8F.28381.DBB5BB15; Sat, 15 Jun 2013 03:06:53 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MOE000LFA9NIC30@mmp2.samsung.com>; Sat, 15 Jun 2013 03:06:53 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org, kyungmin.park@samsung.com, Sylwester Nawrocki Subject: [PATCH] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms Date: Fri, 14 Jun 2013 20:05:31 +0200 Message-id: <1371233131-4294-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNJMWRmVeSWpSXmKPExsVy+t9jQd290bsDDZa/Frc42/SG3aJnw1ZW ixnn9zFZHH7TzurA4tG3ZRWjx+dNcgFMUVw2Kak5mWWpRfp2CVwZnU/eMha85a5YtGIJcwPj bK4uRk4OCQETiR3/17BB2GISF+6tB7OFBKYzStx5F9jFyAVkdzBJ9B++zQSSYBMwlOg92scI YosIyEs86b0B1sAskC+xaeZOFhBbWCBMYkb7OdYuRg4OFgFViQsPhEDCvAKuEvOebWYDCUsI KEjMmWQzgZF7ASPDKkbR1ILkguKk9FxDveLE3OLSvHS95PzcTYxgLz+T2sG4ssHiEKMAB6MS D+8Etd2BQqyJZcWVuYcYJTiYlUR476oChXhTEiurUovy44tKc1KLDzFKc7AoifMeaLUOFBJI TyxJzU5NLUgtgskycXBKNTDaH2FvKQhU2RjD2Z2z4F+KRaPJytxolaONsfMaWE6l/CzgeMLv JM2qo5j07V195ReP+qS0sibfl8eFDhW+3nfDMdQzK0rxR44hc/2fPf2X9wm1lC0PFincq9X/ g9HlY9j2CWHFh5YzzcrXfL5rs7L1xUgVL9GG9wbcH37M2ChR7RB+bbXVdiWW4oxEQy3mouJE ACwWHtLuAQAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The FIMC-LITE IP block is available only on platforms instantiated from device tree. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park --- drivers/media/platform/exynos4-is/fimc-lite.c | 3 --- drivers/media/platform/exynos4-is/fimc-lite.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c index 3f76f8a..00c525c 100644 --- a/drivers/media/platform/exynos4-is/fimc-lite.c +++ b/drivers/media/platform/exynos4-is/fimc-lite.c @@ -1449,9 +1449,6 @@ static int fimc_lite_probe(struct platform_device *pdev) if (of_id) drv_data = (struct flite_drvdata *)of_id->data; fimc->index = of_alias_get_id(dev->of_node, "fimc-lite"); - } else { - drv_data = fimc_lite_get_drvdata(pdev); - fimc->index = pdev->id; } if (!drv_data || fimc->index < 0 || fimc->index >= FIMC_LITE_MAX_DEVS) diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/exynos4-is/fimc-lite.h index c7aa084..4b10684 100644 --- a/drivers/media/platform/exynos4-is/fimc-lite.h +++ b/drivers/media/platform/exynos4-is/fimc-lite.h @@ -56,9 +56,6 @@ struct flite_drvdata { unsigned short out_hor_offs_align; }; -#define fimc_lite_get_drvdata(_pdev) \ - ((struct flite_drvdata *) platform_get_device_id(_pdev)->driver_data) - struct fimc_lite_events { unsigned int data_overflow; };