From patchwork Thu Apr 13 01:57:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 40788 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyU4Y-0000J8-Kv; Thu, 13 Apr 2017 02:01:22 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1cyU4V-0001aO-2g; Thu, 13 Apr 2017 04:01:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755862AbdDMCBG (ORCPT + 1 other); Wed, 12 Apr 2017 22:01:06 -0400 Received: from mail.windriver.com ([147.11.1.11]:44832 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755509AbdDMCBG (ORCPT ); Wed, 12 Apr 2017 22:01:06 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id v3D20xk2013443 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Wed, 12 Apr 2017 19:00:59 -0700 (PDT) Received: from yow-lpgnfs-02.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.294.0; Wed, 12 Apr 2017 19:00:59 -0700 From: Paul Gortmaker To: CC: Paul Gortmaker , Mauro Carvalho Chehab , Greg Kroah-Hartman , Alan Cox , , Subject: [PATCH] staging/media: make atomisp vlv2_plat_clock explicitly non-modular Date: Wed, 12 Apr 2017 21:57:55 -0400 Message-ID: <20170413015755.4533-1-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.4.13.15117 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CT 0, __CT_TEXT_PLAIN 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' The Makefile / Kconfig currently controlling compilation of this code is: clock/Makefile:obj-$(CONFIG_INTEL_ATOMISP) += vlv2_plat_clock.o atomisp/Kconfig:menuconfig INTEL_ATOMISP atomisp/Kconfig: bool "Enable support to Intel MIPI camera drivers" ...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 was already not in use by this driver, the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Cc: Mauro Carvalho Chehab Cc: Greg Kroah-Hartman Cc: Alan Cox Cc: linux-media@vger.kernel.org Cc: devel@driverdev.osuosl.org Signed-off-by: Paul Gortmaker --- .../media/atomisp/platform/clock/vlv2_plat_clock.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c b/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c index 25e939c50aef..a322539d2621 100644 --- a/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c +++ b/drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "../../include/linux/vlv2_plat_clock.h" @@ -205,18 +205,10 @@ static int vlv2_plat_clk_probe(struct platform_device *pdev) return 0; } -static int vlv2_plat_clk_remove(struct platform_device *pdev) -{ - iounmap(pmc_base); - pmc_base = NULL; - return 0; -} - static const struct platform_device_id vlv2_plat_clk_id[] = { {"vlv2_plat_clk", 0}, {} }; -MODULE_DEVICE_TABLE(platform, vlv2_plat_clk_id); static int vlv2_resume(struct device *device) { @@ -241,7 +233,6 @@ static const struct dev_pm_ops vlv2_pm_ops = { static struct platform_driver vlv2_plat_clk_driver = { .probe = vlv2_plat_clk_probe, - .remove = vlv2_plat_clk_remove, .id_table = vlv2_plat_clk_id, .driver = { .name = "vlv2_plat_clk", @@ -254,13 +245,3 @@ static int __init vlv2_plat_clk_init(void) return platform_driver_register(&vlv2_plat_clk_driver); } arch_initcall(vlv2_plat_clk_init); - -static void __exit vlv2_plat_clk_exit(void) -{ - platform_driver_unregister(&vlv2_plat_clk_driver); -} -module_exit(vlv2_plat_clk_exit); - -MODULE_AUTHOR("Asutosh Pathak "); -MODULE_DESCRIPTION("Intel VLV2 platform clock driver"); -MODULE_LICENSE("GPL v2");