Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1339023 > unrolled thread
| Started by | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| First post | 2016-02-22 01:10 +0100 |
| Last post | 2016-02-22 12:30 +0100 |
| Articles | 5 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v2 0/5] xen: avoid module usage in non-modular code Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-22 01:10 +0100
[PATCH v2 1/5] xen: audit usages of module.h ; remove unnecessary instances Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-22 01:10 +0100
[PATCH v2 2/5] drivers/xen: make [xen-]ballon explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-22 01:10 +0100
[PATCH v2 5/5] drivers/xen: make platform-pci.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2016-02-22 01:10 +0100
Re: [PATCH v2 5/5] drivers/xen: make platform-pci.c explicitly non-modular Stefano Stabellini <stefano.stabellini@eu.citrix.com> - 2016-02-22 12:30 +0100
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2016-02-22 01:10 +0100 |
| Subject | [PATCH v2 0/5] xen: avoid module usage in non-modular code |
| Message-ID | <r4MeC-5Gm-19@gated-at.bofh.it> |
This series of commits is a part of a larger project to ensure
people don't reference modular support functions in non-modular
code. Overall there was roughly 5k lines of dead code in the
kernel due to this. So far we've fixed several areas, like tty,
x86, net, ... and we continue to work on other areas.
There are several reasons to not use module support for code that
can never be built as a module, but the big ones are:
(1) it is easy to accidentally write unused module_exit and remove code
(2) it can be misleading when reading the source, thinking it can be
modular when the Makefile and/or Kconfig prohibit it
(3) it requires the include of the module.h header file which in turn
includes nearly everything else.
(4) it gets copied/replicated into other code and spreads like weeds.
For the xen subsystem, there are just five commits:
First, we get rid of "include <linux/module.h>" instances that are
completely unnecessary.
Then #2 and #3 and #5 are basically trivial remapping to the
appropriate non-modular counterparts, meaning that there is no
runtime change here either.
The fourth hypervisor commit is similar, but also has removal of
some dead code associated with the module_exit function that will
never be called. So the runtime should be the same, but the object
file will be different (reduced in size).
Patches created on linux-next and build tested for x86-64 and ARM64
allmodconfig.
---
[v2: manually inline one-liners in #4; update probe vs init fcn names
in #5 ; both suggestions by Stefano ; add Reviewed tags to #1, #2, #3.
Redid build testing on x86-64 and ARM64 to test for typos etc. ]
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: xen-devel@lists.xenproject.org
Paul Gortmaker (5):
xen: audit usages of module.h ; remove unnecessary instances
drivers/xen: make [xen-]ballon explicitly non-modular
drivers/xen: make xenbus_dev_[front/back]end explicitly non-modular
drivers/xen: make sys-hypervisor.c explicitly non-modular
drivers/xen: make platform-pci.c explicitly non-modular
arch/arm/include/asm/xen/hypercall.h | 2 ++
drivers/xen/balloon.c | 4 ----
drivers/xen/events/events_2l.c | 1 -
drivers/xen/events/events_base.c | 2 +-
drivers/xen/events/events_fifo.c | 1 -
drivers/xen/features.c | 2 +-
drivers/xen/grant-table.c | 1 -
drivers/xen/platform-pci.c | 16 ++++++----------
drivers/xen/sys-hypervisor.c | 31 ++++---------------------------
drivers/xen/xen-balloon.c | 14 +++-----------
drivers/xen/xen-pciback/conf_space.c | 2 +-
drivers/xen/xen-pciback/pciback_ops.c | 2 +-
drivers/xen/xen-pciback/xenbus.c | 2 +-
drivers/xen/xen-selfballoon.c | 1 -
drivers/xen/xenbus/xenbus_dev_backend.c | 13 ++-----------
drivers/xen/xenbus/xenbus_dev_frontend.c | 13 ++-----------
drivers/xen/xenbus/xenbus_xs.c | 1 -
drivers/xen/xenfs/xensyms.c | 1 -
18 files changed, 24 insertions(+), 85 deletions(-)
--
2.6.1
Paul Gortmaker (5):
xen: audit usages of module.h ; remove unnecessary instances
drivers/xen: make [xen-]ballon explicitly non-modular
drivers/xen: make xenbus_dev_[front/back]end explicitly non-modular
drivers/xen: make sys-hypervisor.c explicitly non-modular
drivers/xen: make platform-pci.c explicitly non-modular
arch/arm/include/asm/xen/hypercall.h | 2 ++
drivers/xen/balloon.c | 4 ---
drivers/xen/events/events_2l.c | 1 -
drivers/xen/events/events_base.c | 2 +-
drivers/xen/events/events_fifo.c | 1 -
drivers/xen/features.c | 2 +-
drivers/xen/grant-table.c | 1 -
drivers/xen/platform-pci.c | 22 +++++-------
drivers/xen/sys-hypervisor.c | 59 +++++---------------------------
drivers/xen/xen-balloon.c | 14 ++------
drivers/xen/xen-pciback/conf_space.c | 2 +-
drivers/xen/xen-pciback/pciback_ops.c | 2 +-
drivers/xen/xen-pciback/xenbus.c | 2 +-
drivers/xen/xen-selfballoon.c | 1 -
drivers/xen/xenbus/xenbus_dev_backend.c | 13 ++-----
drivers/xen/xenbus/xenbus_dev_frontend.c | 13 ++-----
drivers/xen/xenbus/xenbus_xs.c | 1 -
drivers/xen/xenfs/xensyms.c | 1 -
18 files changed, 31 insertions(+), 112 deletions(-)
--
2.6.1
[toc] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2016-02-22 01:10 +0100 |
| Subject | [PATCH v2 1/5] xen: audit usages of module.h ; remove unnecessary instances |
| Message-ID | <r4MeD-5Gm-31@gated-at.bofh.it> |
| In reply to | #1339023 |
Code that uses no modular facilities whatsoever should not be sourcing module.h at all, since that header drags in a bunch of other headers with it. Similarly, code that is not explicitly using modular facilities like module_init() but only is declaring module_param setup variables should be using moduleparam.h and not the larger module.h file for that. In making this change, we also uncover an implicit use of BUG() in inline fcns within arch/arm/include/asm/xen/hypercall.h so we explicitly source <linux/bug.h> for that file now. Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: David Vrabel <david.vrabel@citrix.com> Cc: xen-devel@lists.xenproject.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/arm/include/asm/xen/hypercall.h | 2 ++ drivers/xen/events/events_2l.c | 1 - drivers/xen/events/events_base.c | 2 +- drivers/xen/events/events_fifo.c | 1 - drivers/xen/features.c | 2 +- drivers/xen/grant-table.c | 1 - drivers/xen/xen-pciback/conf_space.c | 2 +- drivers/xen/xen-pciback/pciback_ops.c | 2 +- drivers/xen/xen-pciback/xenbus.c | 2 +- drivers/xen/xen-selfballoon.c | 1 - drivers/xen/xenbus/xenbus_xs.c | 1 - drivers/xen/xenfs/xensyms.c | 1 - 12 files changed, 7 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/xen/hypercall.h b/arch/arm/include/asm/xen/hypercall.h index d769972db8cb..b6b962d70db9 100644 --- a/arch/arm/include/asm/xen/hypercall.h +++ b/arch/arm/include/asm/xen/hypercall.h @@ -33,6 +33,8 @@ #ifndef _ASM_ARM_XEN_HYPERCALL_H #define _ASM_ARM_XEN_HYPERCALL_H +#include <linux/bug.h> + #include <xen/interface/xen.h> #include <xen/interface/sched.h> #include <xen/interface/platform.h> diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c index 7dd46312c180..51b488f5bfe9 100644 --- a/drivers/xen/events/events_2l.c +++ b/drivers/xen/events/events_2l.c @@ -9,7 +9,6 @@ #include <linux/linkage.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/module.h> #include <asm/sync_bitops.h> #include <asm/xen/hypercall.h> diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 524c22146429..488017a0806a 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -26,7 +26,7 @@ #include <linux/linkage.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/string.h> #include <linux/bootmem.h> #include <linux/slab.h> diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c index eff2b88003d9..9289a17712e2 100644 --- a/drivers/xen/events/events_fifo.c +++ b/drivers/xen/events/events_fifo.c @@ -36,7 +36,6 @@ #include <linux/linkage.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/module.h> #include <linux/smp.h> #include <linux/percpu.h> #include <linux/cpu.h> diff --git a/drivers/xen/features.c b/drivers/xen/features.c index 99eda169c779..d7d34fdfc993 100644 --- a/drivers/xen/features.c +++ b/drivers/xen/features.c @@ -7,7 +7,7 @@ */ #include <linux/types.h> #include <linux/cache.h> -#include <linux/module.h> +#include <linux/export.h> #include <asm/xen/hypercall.h> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index effbaf91791f..bb36b1e1dbcc 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -33,7 +33,6 @@ #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt -#include <linux/module.h> #include <linux/sched.h> #include <linux/mm.h> #include <linux/slab.h> diff --git a/drivers/xen/xen-pciback/conf_space.c b/drivers/xen/xen-pciback/conf_space.c index 9c234209d8b5..8e67336f8ddd 100644 --- a/drivers/xen/xen-pciback/conf_space.c +++ b/drivers/xen/xen-pciback/conf_space.c @@ -10,7 +10,7 @@ */ #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/pci.h> #include "pciback.h" #include "conf_space.h" diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c index 73dafdc494aa..5ad01f9c24fc 100644 --- a/drivers/xen/xen-pciback/pciback_ops.c +++ b/drivers/xen/xen-pciback/pciback_ops.c @@ -6,7 +6,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/wait.h> #include <linux/bitops.h> #include <xen/events.h> diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c index 4843741e703a..c252eb3f0176 100644 --- a/drivers/xen/xen-pciback/xenbus.c +++ b/drivers/xen/xen-pciback/xenbus.c @@ -6,7 +6,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/init.h> #include <linux/list.h> #include <linux/vmalloc.h> diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c index 3b2bffde534f..53a085fca00c 100644 --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c @@ -71,7 +71,6 @@ #include <linux/swap.h> #include <linux/mm.h> #include <linux/mman.h> -#include <linux/module.h> #include <linux/workqueue.h> #include <linux/device.h> #include <xen/balloon.h> diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index ba804f3d8278..374b12af8812 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c @@ -44,7 +44,6 @@ #include <linux/fcntl.h> #include <linux/kthread.h> #include <linux/rwsem.h> -#include <linux/module.h> #include <linux/mutex.h> #include <asm/xen/hypervisor.h> #include <xen/xenbus.h> diff --git a/drivers/xen/xenfs/xensyms.c b/drivers/xen/xenfs/xensyms.c index a03f261b12d8..c6e2b4a542ea 100644 --- a/drivers/xen/xenfs/xensyms.c +++ b/drivers/xen/xenfs/xensyms.c @@ -1,4 +1,3 @@ -#include <linux/module.h> #include <linux/init.h> #include <linux/seq_file.h> #include <linux/fs.h> -- 2.6.1
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2016-02-22 01:10 +0100 |
| Subject | [PATCH v2 2/5] drivers/xen: make [xen-]ballon explicitly non-modular |
| Message-ID | <r4MeD-5Gm-35@gated-at.bofh.it> |
| In reply to | #1339023 |
The Makefile / Kconfig currently controlling compilation here is:
obj-y += grant-table.o features.o balloon.o manage.o preempt.o time.o
[...]
obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o
...with:
drivers/xen/Kconfig:config XEN_BALLOON
drivers/xen/Kconfig: bool "Xen memory balloon driver"
...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.
In doing so we uncover two implict includes that were obtained
by module.h having such a wide include scope itself:
In file included from drivers/xen/xen-balloon.c:41:0:
include/xen/balloon.h:26:51: warning: ‘struct page’ declared inside parameter list [enabled by default]
int alloc_xenballooned_pages(int nr_pages, struct page **pages);
^
include/xen/balloon.h: In function ‘register_xen_selfballooning’:
include/xen/balloon.h:35:10: error: ‘ENOSYS’ undeclared (first use in this function)
return -ENOSYS;
^
This is fixed by adding mm-types.h and errno.h to the list.
We also delete the MODULE_LICENSE tags since all that information
is already contained at the top of the file in the comments.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/xen/balloon.c | 4 ----
drivers/xen/xen-balloon.c | 14 +++-----------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 7c8a2cf16f58..9781e0dd59d6 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -42,7 +42,6 @@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/errno.h>
-#include <linux/module.h>
#include <linux/mm.h>
#include <linux/bootmem.h>
#include <linux/pagemap.h>
@@ -760,7 +759,4 @@ static int __init balloon_init(void)
return 0;
}
-
subsys_initcall(balloon_init);
-
-MODULE_LICENSE("GPL");
diff --git a/drivers/xen/xen-balloon.c b/drivers/xen/xen-balloon.c
index 39e7ef8d3957..79865b8901ba 100644
--- a/drivers/xen/xen-balloon.c
+++ b/drivers/xen/xen-balloon.c
@@ -33,7 +33,9 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/mm_types.h>
+#include <linux/init.h>
#include <linux/capability.h>
#include <xen/xen.h>
@@ -109,14 +111,6 @@ static int __init balloon_init(void)
}
subsys_initcall(balloon_init);
-static void balloon_exit(void)
-{
- /* XXX - release balloon here */
- return;
-}
-
-module_exit(balloon_exit);
-
#define BALLOON_SHOW(name, format, args...) \
static ssize_t show_##name(struct device *dev, \
struct device_attribute *attr, \
@@ -250,5 +244,3 @@ static int register_balloon(struct device *dev)
return 0;
}
-
-MODULE_LICENSE("GPL");
--
2.6.1
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2016-02-22 01:10 +0100 |
| Subject | [PATCH v2 5/5] drivers/xen: make platform-pci.c explicitly non-modular |
| Message-ID | <r4MeD-5Gm-37@gated-at.bofh.it> |
| In reply to | #1339023 |
The Kconfig currently controlling compilation of this code is:
arch/x86/xen/Kconfig:config XEN_PVHVM
arch/x86/xen/Kconfig: def_bool y
...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_DEVICE_TABLE is a no-op for non-modular code.
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.
In removing "module" from the init fcn name, we observe a namespace
collision with the probe function, so we use "probe" in the name of
the probe function, and "init" in the registration fcn, as per
standard convention, as suggested by Stefano.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/xen/platform-pci.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index 3454973dc3bb..cf9666680c8c 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -2,6 +2,9 @@
* platform-pci.c
*
* Xen platform PCI device driver
+ *
+ * Authors: ssmith@xensource.com and stefano.stabellini@eu.citrix.com
+ *
* Copyright (c) 2005, Intel Corporation.
* Copyright (c) 2007, XenSource Inc.
* Copyright (c) 2010, Citrix
@@ -24,7 +27,7 @@
#include <linux/interrupt.h>
#include <linux/io.h>
-#include <linux/module.h>
+#include <linux/init.h>
#include <linux/pci.h>
#include <xen/platform_pci.h>
@@ -36,10 +39,6 @@
#define DRV_NAME "xen-platform-pci"
-MODULE_AUTHOR("ssmith@xensource.com and stefano.stabellini@eu.citrix.com");
-MODULE_DESCRIPTION("Xen platform PCI device");
-MODULE_LICENSE("GPL");
-
static unsigned long platform_mmio;
static unsigned long platform_mmio_alloc;
static unsigned long platform_mmiolen;
@@ -101,8 +100,8 @@ static int platform_pci_resume(struct pci_dev *pdev)
return 0;
}
-static int platform_pci_init(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int platform_pci_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
int i, ret;
long ioaddr;
@@ -181,20 +180,17 @@ static struct pci_device_id platform_pci_tbl[] = {
{0,}
};
-MODULE_DEVICE_TABLE(pci, platform_pci_tbl);
-
static struct pci_driver platform_driver = {
.name = DRV_NAME,
- .probe = platform_pci_init,
+ .probe = platform_pci_probe,
.id_table = platform_pci_tbl,
#ifdef CONFIG_PM
.resume_early = platform_pci_resume,
#endif
};
-static int __init platform_pci_module_init(void)
+static int __init platform_pci_init(void)
{
return pci_register_driver(&platform_driver);
}
-
-module_init(platform_pci_module_init);
+device_initcall(platform_pci_init);
--
2.6.1
[toc] | [prev] | [next] | [standalone]
| From | Stefano Stabellini <stefano.stabellini@eu.citrix.com> |
|---|---|
| Date | 2016-02-22 12:30 +0100 |
| Subject | Re: [PATCH v2 5/5] drivers/xen: make platform-pci.c explicitly non-modular |
| Message-ID | <r4WQH-51k-19@gated-at.bofh.it> |
| In reply to | #1339027 |
On Sun, 21 Feb 2016, Paul Gortmaker wrote:
> The Kconfig currently controlling compilation of this code is:
>
> arch/x86/xen/Kconfig:config XEN_PVHVM
> arch/x86/xen/Kconfig: def_bool y
>
> ...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_DEVICE_TABLE is a no-op for non-modular code.
>
> 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.
>
> In removing "module" from the init fcn name, we observe a namespace
> collision with the probe function, so we use "probe" in the name of
> the probe function, and "init" in the registration fcn, as per
> standard convention, as suggested by Stefano.
>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: David Vrabel <david.vrabel@citrix.com>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: xen-devel@lists.xenproject.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> drivers/xen/platform-pci.c | 22 +++++++++-------------
> 1 file changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
> index 3454973dc3bb..cf9666680c8c 100644
> --- a/drivers/xen/platform-pci.c
> +++ b/drivers/xen/platform-pci.c
> @@ -2,6 +2,9 @@
> * platform-pci.c
> *
> * Xen platform PCI device driver
> + *
> + * Authors: ssmith@xensource.com and stefano.stabellini@eu.citrix.com
> + *
> * Copyright (c) 2005, Intel Corporation.
> * Copyright (c) 2007, XenSource Inc.
> * Copyright (c) 2010, Citrix
> @@ -24,7 +27,7 @@
>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> -#include <linux/module.h>
> +#include <linux/init.h>
> #include <linux/pci.h>
>
> #include <xen/platform_pci.h>
> @@ -36,10 +39,6 @@
>
> #define DRV_NAME "xen-platform-pci"
>
> -MODULE_AUTHOR("ssmith@xensource.com and stefano.stabellini@eu.citrix.com");
> -MODULE_DESCRIPTION("Xen platform PCI device");
> -MODULE_LICENSE("GPL");
> -
> static unsigned long platform_mmio;
> static unsigned long platform_mmio_alloc;
> static unsigned long platform_mmiolen;
> @@ -101,8 +100,8 @@ static int platform_pci_resume(struct pci_dev *pdev)
> return 0;
> }
>
> -static int platform_pci_init(struct pci_dev *pdev,
> - const struct pci_device_id *ent)
> +static int platform_pci_probe(struct pci_dev *pdev,
> + const struct pci_device_id *ent)
> {
> int i, ret;
> long ioaddr;
> @@ -181,20 +180,17 @@ static struct pci_device_id platform_pci_tbl[] = {
> {0,}
> };
>
> -MODULE_DEVICE_TABLE(pci, platform_pci_tbl);
> -
> static struct pci_driver platform_driver = {
> .name = DRV_NAME,
> - .probe = platform_pci_init,
> + .probe = platform_pci_probe,
> .id_table = platform_pci_tbl,
> #ifdef CONFIG_PM
> .resume_early = platform_pci_resume,
> #endif
> };
>
> -static int __init platform_pci_module_init(void)
> +static int __init platform_pci_init(void)
> {
> return pci_register_driver(&platform_driver);
> }
> -
> -module_init(platform_pci_module_init);
> +device_initcall(platform_pci_init);
> --
> 2.6.1
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web