From patchwork Fri Aug 11 13:49:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9895995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D0994602DA for ; Fri, 11 Aug 2017 13:49:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1B0628BFB for ; Fri, 11 Aug 2017 13:49:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6A3F28C32; Fri, 11 Aug 2017 13:49:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5EB1928BFB for ; Fri, 11 Aug 2017 13:49:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0BC02890C2; Fri, 11 Aug 2017 13:49:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [IPv6:2001:4b98:dc2:45:216:3eff:febb:480d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3914D6E6E8 for ; Fri, 11 Aug 2017 13:49:06 +0000 (UTC) Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id 43FFE21324; Fri, 11 Aug 2017 15:47:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1502459270; bh=F0YG7h8x6C26eXVZGQn8jagLOvhB5FrIet6hllvlA4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r2HYBc4/iaJElwYRuKu3F1oJqkrYGa47ELc5KNRHBdOU7m8xxMOTLdV6kyg/IdRR6 8RXLBNKUvAcq/LwFuimQ//75wy2bBVokABX6nvR+YBqY5042RlAadFAnkUB54GqIDr M3fHUlPSkE4MDoElwdVnCL4rBFafMUr1zWKzdBrA= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 08/11] drm: omapdrm: Remove the omapdss driver Date: Fri, 11 Aug 2017 16:49:09 +0300 Message-Id: <20170811134912.6429-9-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170811134912.6429-1-laurent.pinchart@ideasonboard.com> References: <20170811134912.6429-1-laurent.pinchart@ideasonboard.com> Cc: Tomi Valkeinen 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The omapdss driver (not to be confused with the omapdss_dss driver) is now a dummy driver with empty probe and remove functions. Remove it. Signed-off-by: Laurent Pinchart Reviewed-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/core.c | 47 ----------------------------------- drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - 2 files changed, 48 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c index 8678d8b4efce..79bf6b8e2515 100644 --- a/drivers/gpu/drm/omapdrm/dss/core.c +++ b/drivers/gpu/drm/omapdrm/dss/core.c @@ -25,50 +25,11 @@ #include #include #include -#include -#include #include -#include -#include -#include -#include -#include #include "omapdss.h" #include "dss.h" -static struct { - struct platform_device *pdev; -} core; - -enum omapdss_version omapdss_get_version(void) -{ - struct omap_dss_board_info *pdata = core.pdev->dev.platform_data; - return pdata->version; -} -EXPORT_SYMBOL(omapdss_get_version); - -/* PLATFORM DEVICE */ - -static int __init omap_dss_probe(struct platform_device *pdev) -{ - core.pdev = pdev; - - return 0; -} - -static int omap_dss_remove(struct platform_device *pdev) -{ - return 0; -} - -static struct platform_driver omap_dss_driver = { - .remove = omap_dss_remove, - .driver = { - .name = "omapdss", - }, -}; - /* INIT */ static int (*dss_output_drv_reg_funcs[])(void) __initdata = { dss_init_platform_driver, @@ -117,10 +78,6 @@ static int __init omap_dss_init(void) int r; int i; - r = platform_driver_probe(&omap_dss_driver, omap_dss_probe); - if (r) - return r; - for (i = 0; i < ARRAY_SIZE(dss_output_drv_reg_funcs); ++i) { r = dss_output_drv_reg_funcs[i](); if (r) @@ -139,8 +96,6 @@ static int __init omap_dss_init(void) ++i) dss_output_drv_unreg_funcs[i](); - platform_driver_unregister(&omap_dss_driver); - return r; } @@ -152,8 +107,6 @@ static void __exit omap_dss_exit(void) for (i = 0; i < ARRAY_SIZE(dss_output_drv_unreg_funcs); ++i) dss_output_drv_unreg_funcs[i](); - - platform_driver_unregister(&omap_dss_driver); } module_init(omap_dss_init); diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h index 2bc75b7148df..ffabd5505895 100644 --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h @@ -565,7 +565,6 @@ struct omap_dss_driver { const struct hdmi_avi_infoframe *avi); }; -enum omapdss_version omapdss_get_version(void); bool omapdss_is_initialized(void); int omap_dss_register_driver(struct omap_dss_driver *);