[PATCH 0/3] Add new builtin_misc_device users

[PATCH 0/3] Add new builtin_misc_device users

[Paul Gortmaker]

The new macro builtin_misc_device doesn't currently exist anywhere
other than Greg's char-misc tree.  As such I was going to stagger
the patches containing users of it by a merge window to avoid any
dependency issues, but Greg offered to take the users in via the
char-misc tree which also solves the dependency issue (assuming
the blackfin and s390 people don't mind).

So these three patches are the ones from my queue that use the
new macro.  Build tested for s390 and blackfin to ensure no typos
or implicit include issues inadvertently crept in.

We are simply replacing module_misc_device with the new
builtin_misc_device in code that is always built in due to
the Makefile/Kconfig settings controlling it.  Along with that
we get rid of any other modular related references that are
inactive in the always non-modular case.

Paul.

---

Cc: Bas Vermeulen <bvermeul@blackstar.xs4all.nl>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matias Bjorling <mb@lightnvm.io>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-s390@vger.kernel.org

Paul Gortmaker (3):
  lightnvm: make core.c explicitly non-modular
  blackfin: make-bf561/coreb.c explicitly non-modular
  s390: char: make slp_ctl explicitly non-modular

 arch/blackfin/mach-bf561/coreb.c | 10 ++++------
 drivers/lightnvm/core.c          | 14 ++++++--------
 drivers/s390/char/sclp_ctl.c     |  4 ++--
 3 files changed, 12 insertions(+), 16 deletions(-)

-- 
2.10.1

[PATCH 3/3] s390: char: make slp_ctl explicitly non-modular

[Paul Gortmaker]

The Makefile currently controlling compilation of this code is obj-y,
meaning that it currently is not being built as a module by anyone.

Lets remove the couple traces of modular usage, so that when reading
the driver there is no doubt it is builtin-only.

Since module_misc_device translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: linux-s390@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 drivers/s390/char/sclp_ctl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/s390/char/sclp_ctl.c b/drivers/s390/char/sclp_ctl.c
index 554eaa1e347d..78a7e4f94721 100644
--- a/drivers/s390/char/sclp_ctl.c
+++ b/drivers/s390/char/sclp_ctl.c
@@ -10,7 +10,7 @@
 #include <linux/uaccess.h>
 #include <linux/miscdevice.h>
 #include <linux/gfp.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/ioctl.h>
 #include <linux/fs.h>
 #include <asm/compat.h>
@@ -126,4 +126,4 @@ static struct miscdevice sclp_ctl_device = {
 	.name = "sclp",
 	.fops = &sclp_ctl_fops,
 };
-module_misc_device(sclp_ctl_device);
+builtin_misc_device(sclp_ctl_device);
-- 
2.10.1

Re: [PATCH 3/3] s390: char: make slp_ctl explicitly non-modular

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 2118 bytes --]

Hi Paul,

[auto build test ERROR on linus/master]
[also build test ERROR on v4.9-rc3 next-20161028]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
[Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on]
[Check https://git-scm.com/docs/git-format-patch for more information]

url:    https://github.com/0day-ci/linux/commits/Paul-Gortmaker/lightnvm-make-core-c-explicitly-non-modular/20161030-044459
config: s390-default_defconfig (attached as .config)
compiler: s390x-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=s390 

All error/warnings (new ones prefixed by >>):

>> drivers/s390/char/sclp_ctl.c:129:1: warning: data definition has no type or storage class
    builtin_misc_device(sclp_ctl_device);
    ^~~~~~~~~~~~~~~~~~~
>> drivers/s390/char/sclp_ctl.c:129:1: error: type defaults to 'int' in declaration of 'builtin_misc_device' [-Werror=implicit-int]
>> drivers/s390/char/sclp_ctl.c:129:1: warning: parameter names (without types) in function declaration
>> drivers/s390/char/sclp_ctl.c:124:26: warning: 'sclp_ctl_device' defined but not used [-Wunused-variable]
    static struct miscdevice sclp_ctl_device = {
                             ^~~~~~~~~~~~~~~
   cc1: some warnings being treated as errors

vim +129 drivers/s390/char/sclp_ctl.c

   118		.llseek = no_llseek,
   119	};
   120	
   121	/*
   122	 * Misc device definition
   123	 */
 > 124	static struct miscdevice sclp_ctl_device = {
   125		.minor = MISC_DYNAMIC_MINOR,
   126		.name = "sclp",
   127		.fops = &sclp_ctl_fops,
   128	};
 > 129	builtin_misc_device(sclp_ctl_device);

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 16407 bytes --]

Re: [PATCH 3/3] s390: char: make slp_ctl explicitly non-modular

[Martin Schwidefsky]

On Sat, 29 Oct 2016 16:38:43 -0400
Paul Gortmaker <paul.gortmaker@windriver.com> wrote:

> The Makefile currently controlling compilation of this code is obj-y,
> meaning that it currently is not being built as a module by anyone.
> 
> Lets remove the couple traces of modular usage, so that when reading
> the driver there is no doubt it is builtin-only.
> 
> Since module_misc_device translates to device_initcall in the non-modular
> case, the init ordering remains unchanged with this commit.
> 
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
> Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
> Cc: linux-s390@vger.kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

That idea behind the patch makes sense to me. But the built robot
reports a new warning which should be fixed. If that is done:

Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.

Re: [PATCH 3/3] s390: char: make slp_ctl explicitly non-modular

[Paul Gortmaker]

[Re: [PATCH 3/3] s390: char: make slp_ctl explicitly non-modular] On 30/10/2016 (Sun 14:43) Martin Schwidefsky wrote:

[...]

> That idea behind the patch makes sense to me. But the built robot
> reports a new warning which should be fixed. If that is done:
> 
> Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

The kbuild robot is a false positive ; it test-applied the patches on
master and not on Greg's char-misc ; which as per the 0/3 text is the
whole reason we are putting these patches in via Greg's branch.  So
there should be nothing to fix once they are in the right place.

Paul.
--

> 
> -- 
> blue skies,
>    Martin.
> 
> "Reality continues to ruin my life." - Calvin.
>