Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

drivers/xen: make xenbus_dev_[front/back]end explicitly non-modular

Browse Source 
The Makefile / Kconfig currently controlling compilation here is:

obj-y   += xenbus_dev_frontend.o
[...]
obj-$(CONFIG_XEN_BACKEND) += xenbus_dev_backend.o

...with:

drivers/xen/Kconfig:config XEN_BACKEND
drivers/xen/Kconfig:    bool "Backend driver support"

...meaning that they currently are not being built as modules 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 also delete the MODULE_LICENSE tag since all that information
is already contained at the top of the file in the comments.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
This commit is contained in:
Paul Gortmaker 2016-02-21 19:06:06 -05:00 committed by David Vrabel
parent 106eaa8e6e
commit ab1241a1fc
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/xen/xenbus/xenbus_dev_backend.c
View File

@ -5,7 +5,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/module.h> #include <linux/init.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <xen/xen.h> #include <xen/xen.h>
@ -18,8 +18,6 @@
#include "xenbus_comms.h" #include "xenbus_comms.h"
MODULE_LICENSE("GPL");
static int xenbus_backend_open(struct inode *inode, struct file *filp) static int xenbus_backend_open(struct inode *inode, struct file *filp)
{ {
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
@ -132,11 +130,4 @@ static int __init xenbus_backend_init(void)
pr_err("Could not register xenbus backend device\n"); pr_err("Could not register xenbus backend device\n");
return err; return err;
} }
device_initcall(xenbus_backend_init);
static void __exit xenbus_backend_exit(void)
{
misc_deregister(&xenbus_backend_dev);
}
module_init(xenbus_backend_init);
module_exit(xenbus_backend_exit);

13
drivers/xen/xenbus/xenbus_dev_frontend.c
View File

@ -55,7 +55,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/module.h> #include <linux/init.h>
#include "xenbus_comms.h" #include "xenbus_comms.h"
@ -63,8 +63,6 @@
#include <xen/xen.h> #include <xen/xen.h>
#include <asm/xen/hypervisor.h> #include <asm/xen/hypervisor.h>
MODULE_LICENSE("GPL");
/* /*
* An element of a list of outstanding transactions, for which we're * An element of a list of outstanding transactions, for which we're
* still waiting a reply. * still waiting a reply.
@ -624,11 +622,4 @@ static int __init xenbus_init(void)
pr_err("Could not register xenbus frontend device\n"); pr_err("Could not register xenbus frontend device\n");
return err; return err;
} }
device_initcall(xenbus_init);
static void __exit xenbus_exit(void)
{
misc_deregister(&xenbus_dev);
}
module_init(xenbus_init);
module_exit(xenbus_exit);