The patch titled
drivers/char/applicom.c: proper module_{init,exit}
has been added to the -mm tree. Its filename is
drivers-char-applicomc-proper-module_initexit.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Adrian Bunk <bunk@xxxxxxxxx>
Convert the driver to use module_{init,exit}.
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Acked-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/applicom.c | 40 +++-----------------------------------
1 files changed, 4 insertions(+), 36 deletions(-)
diff -puN drivers/char/applicom.c~drivers-char-applicomc-proper-module_initexit drivers/char/applicom.c
--- devel/drivers/char/applicom.c~drivers-char-applicomc-proper-module_initexit 2006-05-17 23:33:40.000000000 -0700
+++ devel-akpm/drivers/char/applicom.c 2006-05-17 23:33:40.000000000 -0700
@@ -166,11 +166,7 @@ static int ac_register_board(unsigned lo
return boardno + 1;
}
-#ifdef MODULE
-
-#define applicom_init init_module
-
-void cleanup_module(void)
+static void __exit applicom_exit(void)
{
unsigned int i;
@@ -188,9 +184,7 @@ void cleanup_module(void)
}
}
-#endif /* MODULE */
-
-int __init applicom_init(void)
+static int __init applicom_init(void)
{
int i, numisa = 0;
struct pci_dev *dev = NULL;
@@ -358,10 +352,9 @@ out:
return ret;
}
+module_init(applicom_init);
+module_exit(applicom_exit);
-#ifndef MODULE
-__initcall(applicom_init);
-#endif
static ssize_t ac_write(struct file *file, const char __user *buf, size_t count, loff_t * ppos)
{
@@ -854,28 +847,3 @@ static int ac_ioctl(struct inode *inode,
return 0;
}
-#ifndef MODULE
-static int __init applicom_setup(char *str)
-{
- int ints[4];
-
- (void) get_options(str, 4, ints);
-
- if (ints[0] > 2) {
- printk(KERN_WARNING "Too many arguments to 'applicom=', expected mem,irq only.\n");
- }
-
- if (ints[0] < 2) {
- printk(KERN_INFO"applicom numargs: %d\n", ints[0]);
- return 0;
- }
-
- mem = ints[1];
- irq = ints[2];
- return 1;
-}
-
-__setup("applicom=", applicom_setup);
-
-#endif /* MODULE */
-
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-acpi.patch
acpiphp-use-new-dock-driver-fix.patch
drivers-base-firmware_classc-cleanups.patch
git-dvb.patch
git-gfs2.patch
git-intelfb.patch
git-mtd.patch
drivers-char-hw_randomc-remove-asserts.patch
drivers-net-s2ioc-make-bus_speed-static.patch
git-net.patch
git-nfs.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-gdthc-make-__gdth_execute-static.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
swsusp-rework-memory-shrinker-rev-2-fix.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
kernel-power-snapshotc-cleanups.patch
remove-fs-jffs2-ioctlc.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
the-scheduled-unexport-of-insert_resource.patch
fs-bufferc-possible-cleanups.patch
drivers-md-raid6algosc-fix-a-null-dereference.patch
kernel-sysc-cleanups.patch
drivers-char-applicomc-proper-module_initexit.patch
time-i386-clocksource-drivers.patch
reiser4.patch
fs-reiser4-misc-cleanups.patch
fbdev-cleanup-the-config_video_select-mess.patch
fbdev-remove-duplicate-includes.patch
md-make-md_print_devices-static.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
x86_64-unexport-ia32_sys_call_table.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
