From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753350AbcBVDNl (ORCPT ); Sun, 21 Feb 2016 22:13:41 -0500 Received: from mail1.windriver.com ([147.11.146.13]:49129 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753068AbcBVDNh (ORCPT ); Sun, 21 Feb 2016 22:13:37 -0500 From: Paul Gortmaker To: CC: Paul Gortmaker , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , "David S. Miller" , , Subject: [PATCH 3/3] drivers/video: make fbdev/sunxvr2500.c explicitly non-modular Date: Sun, 21 Feb 2016 22:13:12 -0500 Message-ID: <1456110792-21771-4-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1456110792-21771-1-git-send-email-paul.gortmaker@windriver.com> References: <1456110792-21771-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Kconfig currently controlling compilation of this code is: config FB_XVR2500 bool "Sun XVR-2500 3DLABS Wildcat support" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. We don't replace module.h with init.h since the file already has that. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/video/fbdev/sunxvr2500.c | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/drivers/video/fbdev/sunxvr2500.c b/drivers/video/fbdev/sunxvr2500.c index 843b6bab0483..1a053292f2eb 100644 --- a/drivers/video/fbdev/sunxvr2500.c +++ b/drivers/video/fbdev/sunxvr2500.c @@ -1,9 +1,10 @@ -/* s3d.c: Sun 3DLABS XVR-2500 et al. driver for sparc64 systems +/* sunxvr2500.c: Sun 3DLABS XVR-2500 et al. fb driver for sparc64 systems + * + * License: GPL * * Copyright (C) 2007 David S. Miller (davem@davemloft.net) */ -#include #include #include #include @@ -219,22 +220,6 @@ err_out: return err; } -static void s3d_pci_unregister(struct pci_dev *pdev) -{ - struct fb_info *info = pci_get_drvdata(pdev); - struct s3d_info *sp = info->par; - - unregister_framebuffer(info); - - iounmap(sp->fb_base); - - pci_release_region(pdev, 1); - - framebuffer_release(info); - - pci_disable_device(pdev); -} - static struct pci_device_id s3d_pci_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002c), }, { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002d), }, @@ -248,10 +233,12 @@ static struct pci_device_id s3d_pci_table[] = { }; static struct pci_driver s3d_driver = { + .driver = { + .suppress_bind_attrs = true, + }, .name = "s3d", .id_table = s3d_pci_table, .probe = s3d_pci_register, - .remove = s3d_pci_unregister, }; static int __init s3d_init(void) @@ -261,16 +248,4 @@ static int __init s3d_init(void) return pci_register_driver(&s3d_driver); } - -static void __exit s3d_exit(void) -{ - pci_unregister_driver(&s3d_driver); -} - -module_init(s3d_init); -module_exit(s3d_exit); - -MODULE_DESCRIPTION("framebuffer driver for Sun XVR-2500 graphics"); -MODULE_AUTHOR("David S. Miller "); -MODULE_VERSION("1.0"); -MODULE_LICENSE("GPL"); +device_initcall(s3d_init); -- 2.6.1