From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752924AbdBMMDf (ORCPT ); Mon, 13 Feb 2017 07:03:35 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:53101 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752249AbdBMMDd (ORCPT ); Mon, 13 Feb 2017 07:03:33 -0500 Subject: Re: [PATCH] s390: crypto make ap_bus explicitly non-modular To: Paul Gortmaker , linux-kernel@vger.kernel.org References: <20170209144810.6347-1-paul.gortmaker@windriver.com> Cc: Harald Freudenberger , Martin Schwidefsky , Heiko Carstens , linux-s390@vger.kernel.org From: Harald Freudenberger Date: Mon, 13 Feb 2017 13:03:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <20170209144810.6347-1-paul.gortmaker@windriver.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17021312-0040-0000-0000-00000328F504 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17021312-0041-0000-0000-00002423BD4F Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-13_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702130119 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/09/2017 03:48 PM, Paul Gortmaker wrote: > The Makefile in drivers/s390 has: > > obj-y += cio/ block/ char/ crypto/ net/ scsi/ virtio/ > > ..and the Makefile in crypto/ has: > > ap-objs := ap_bus.o ap_card.o ap_queue.o > > ...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. > > Also note that MODULE_ALIAS is a no-op for non-module builds. > > We also delete the MODULE_LICENSE tag etc. since all that information > is already contained at the top of the file in the comments. > > We replace module.h with moduleparam.h since the file does declare > some module parameters even though it is not modular itself. > > Cc: Harald Freudenberger > Cc: Martin Schwidefsky > Cc: Heiko Carstens > Cc: linux-s390@vger.kernel.org > Signed-off-by: Paul Gortmaker > --- > drivers/s390/crypto/ap_bus.c | 54 +++----------------------------------------- > 1 file changed, 3 insertions(+), 51 deletions(-) > > diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c > index 5fa699192864..7183a316f9be 100644 > --- a/drivers/s390/crypto/ap_bus.c > +++ b/drivers/s390/crypto/ap_bus.c > @@ -27,7 +27,7 @@ > #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt > > #include > -#include > +#include > #include > #include > #include > @@ -54,16 +54,7 @@ > #include "ap_debug.h" > > /* > - * Module description. > - */ > -MODULE_AUTHOR("IBM Corporation"); > -MODULE_DESCRIPTION("Adjunct Processor Bus driver, " \ > - "Copyright IBM Corp. 2006, 2012"); > -MODULE_LICENSE("GPL"); > -MODULE_ALIAS_CRYPTO("z90crypt"); > - > -/* > - * Module parameter > + * Module parameters; note though this file itself isn't modular. > */ > int ap_domain_index = -1; /* Adjunct Processor Domain Index */ > static DEFINE_SPINLOCK(ap_domain_lock); > @@ -1270,43 +1261,4 @@ int __init ap_module_init(void) > kfree(ap_configuration); > return rc; > } > - > -/** > - * ap_modules_exit(): The module termination code > - * > - * Terminates the module. > - */ > -void ap_module_exit(void) > -{ > - int i; > - > - initialised = false; > - ap_reset_domain(); > - ap_poll_thread_stop(); > - del_timer_sync(&ap_config_timer); > - hrtimer_cancel(&ap_poll_timer); > - tasklet_kill(&ap_tasklet); > - > - /* first remove queue devices */ > - bus_for_each_dev(&ap_bus_type, NULL, NULL, > - __ap_queue_devices_unregister); > - /* now remove the card devices */ > - bus_for_each_dev(&ap_bus_type, NULL, NULL, > - __ap_card_devices_unregister); > - > - /* remove bus attributes */ > - for (i = 0; ap_bus_attrs[i]; i++) > - bus_remove_file(&ap_bus_type, ap_bus_attrs[i]); > - unregister_pm_notifier(&ap_power_notifier); > - root_device_unregister(ap_root_device); > - bus_unregister(&ap_bus_type); > - kfree(ap_configuration); > - unregister_reset_call(&ap_reset_call); > - if (ap_using_interrupts()) > - unregister_adapter_interrupt(&ap_airq); > - > - ap_debug_exit(); > -} > - > -module_init(ap_module_init); > -module_exit(ap_module_exit); > +device_initcall(ap_module_init); Thanks Paul for this patch. I am struggling with the change as I still like to build the ap device driver as a kernel module. It makes the development cycle somewhat easier to have this possibility with just a oneline change in the Makefile (replace obj-$(subst m,y,$(CONFIG_ZCRYPT)) += ap.o with obj-$(CONFIG_ZCRYPT) += ap.o). However, you are right. As the ap driver is official not supported as a module the module code may get removed. Let me think about this some hours ... regards H.Freudenberger