From: Rusty Russell This patch removes MODULE_PARM for everything shown up in allyesconfig minus CONFIG_EXPERIMENTAL and a few broken drivers which didn't compile or who were doing bestial things to module parameters. akpm: this is the part of Rusty's patch which doesn't conflict with other people's pending changes in -mm. It'll take a while to finish this work off. Signed-off-by: Rusty Russell Signed-off-by: Andrew Morton --- 25-akpm/drivers/acpi/asus_acpi.c | 4 - 25-akpm/drivers/block/cpqarray.c | 2 25-akpm/drivers/block/loop.c | 2 25-akpm/drivers/block/nbd.c | 2 25-akpm/drivers/block/paride/bpck6.c | 2 25-akpm/drivers/block/paride/pcd.c | 16 ++-- 25-akpm/drivers/block/paride/pd.c | 18 ++--- 25-akpm/drivers/block/paride/pf.c | 18 ++--- 25-akpm/drivers/block/paride/pg.c | 14 ++-- 25-akpm/drivers/block/paride/pt.c | 14 ++-- 25-akpm/drivers/block/rd.c | 4 - 25-akpm/drivers/bluetooth/bluecard_cs.c | 4 - 25-akpm/drivers/bluetooth/bt3c_cs.c | 4 - 25-akpm/drivers/bluetooth/btuart_cs.c | 4 - 25-akpm/drivers/bluetooth/dtl1_cs.c | 4 - 25-akpm/drivers/cdrom/aztcd.c | 2 25-akpm/drivers/cdrom/gscd.c | 3 25-akpm/drivers/cdrom/isp16.c | 8 +- 25-akpm/drivers/cdrom/mcd.c | 12 ++- 25-akpm/drivers/cdrom/mcdx.c | 11 ++- 25-akpm/drivers/cdrom/optcd.c | 2 25-akpm/drivers/cdrom/sjcd.c | 2 25-akpm/drivers/cdrom/sonycd535.c | 2 25-akpm/drivers/char/agp/amd64-agp.c | 2 25-akpm/drivers/char/agp/sis-agp.c | 4 - 25-akpm/drivers/char/applicom.c | 9 +- 25-akpm/drivers/char/drm/drm_drv.h | 2 25-akpm/drivers/char/i8k.c | 6 - 25-akpm/drivers/char/mwave/mwavedd.c | 10 +- 25-akpm/drivers/char/n_hdlc.c | 4 - 25-akpm/drivers/char/pcmcia/synclink_cs.c | 14 ++-- 25-akpm/drivers/char/scx200_gpio.c | 2 25-akpm/drivers/char/synclink.c | 20 ++--- 25-akpm/drivers/char/synclinkmp.c | 10 +- 25-akpm/drivers/char/tipar.c | 4 - 25-akpm/drivers/char/toshiba.c | 2 25-akpm/drivers/ide/legacy/ide-cs.c | 4 - 25-akpm/drivers/input/serio/parkbd.c | 6 - 25-akpm/drivers/isdn/act2000/module.c | 8 +- 25-akpm/drivers/isdn/capi/capi.c | 6 - 25-akpm/drivers/isdn/capi/capidrv.c | 2 25-akpm/drivers/isdn/capi/kcapi.c | 2 25-akpm/drivers/isdn/hardware/eicon/divamnt.c | 4 - 25-akpm/drivers/isdn/hardware/eicon/divasmain.c | 2 25-akpm/drivers/isdn/hisax/avma1_cs.c | 4 - 25-akpm/drivers/isdn/hisax/elsa_cs.c | 6 - 25-akpm/drivers/isdn/hisax/sedlbauer_cs.c | 6 - 25-akpm/drivers/isdn/hisax/teles_cs.c | 6 - 25-akpm/drivers/isdn/icn/icn.c | 8 +- 25-akpm/drivers/isdn/pcbit/module.c | 5 - 25-akpm/drivers/isdn/sc/init.c | 9 +- 25-akpm/drivers/media/common/ir-common.c | 4 - 25-akpm/drivers/media/common/saa7146_core.c | 2 25-akpm/drivers/media/common/saa7146_video.c | 2 25-akpm/drivers/media/dvb/frontends/cx22702.c | 2 25-akpm/drivers/media/dvb/frontends/dst.c | 4 - 25-akpm/drivers/media/dvb/frontends/nxt6000.c | 2 25-akpm/drivers/media/dvb/frontends/ves1x93.c | 4 - 25-akpm/drivers/media/radio/miropcm20-radio.c | 2 25-akpm/drivers/media/radio/radio-aimslab.c | 4 - 25-akpm/drivers/media/radio/radio-aztech.c | 4 - 25-akpm/drivers/media/radio/radio-cadet.c | 4 - 25-akpm/drivers/media/radio/radio-gemtek-pci.c | 6 - 25-akpm/drivers/media/radio/radio-gemtek.c | 4 - 25-akpm/drivers/media/radio/radio-maestro.c | 2 25-akpm/drivers/media/radio/radio-maxiradio.c | 2 25-akpm/drivers/media/radio/radio-rtrack2.c | 4 - 25-akpm/drivers/media/radio/radio-sf16fmi.c | 4 - 25-akpm/drivers/media/radio/radio-sf16fmr2.c | 4 - 25-akpm/drivers/media/radio/radio-terratec.c | 4 - 25-akpm/drivers/media/radio/radio-trust.c | 4 - 25-akpm/drivers/media/radio/radio-typhoon.c | 12 +-- 25-akpm/drivers/media/radio/radio-zoltrix.c | 4 - 25-akpm/drivers/media/video/adv7170.c | 2 25-akpm/drivers/media/video/adv7175.c | 2 25-akpm/drivers/media/video/bt819.c | 2 25-akpm/drivers/media/video/bt856.c | 2 25-akpm/drivers/media/video/btcx-risc.c | 2 25-akpm/drivers/media/video/bttv-cards.c | 26 +++---- 25-akpm/drivers/media/video/bttv-driver.c | 50 +++++++------- 25-akpm/drivers/media/video/bttv-vbi.c | 4 - 25-akpm/drivers/media/video/bw-qcam.c | 6 - 25-akpm/drivers/media/video/dpc7146.c | 2 25-akpm/drivers/media/video/hexium_gemini.c | 2 25-akpm/drivers/media/video/hexium_orion.c | 2 25-akpm/drivers/media/video/mxb.c | 4 - 25-akpm/drivers/media/video/pms.c | 6 - 25-akpm/drivers/media/video/saa7110.c | 2 25-akpm/drivers/media/video/saa7111.c | 2 25-akpm/drivers/media/video/saa7114.c | 2 25-akpm/drivers/media/video/saa7134/saa7134-core.c | 26 +++---- 25-akpm/drivers/media/video/saa7134/saa7134-i2c.c | 4 - 25-akpm/drivers/media/video/saa7134/saa7134-input.c | 4 - 25-akpm/drivers/media/video/saa7134/saa7134-oss.c | 4 - 25-akpm/drivers/media/video/saa7134/saa7134-ts.c | 6 - 25-akpm/drivers/media/video/saa7134/saa7134-tvaudio.c | 8 +- 25-akpm/drivers/media/video/saa7134/saa7134-vbi.c | 4 - 25-akpm/drivers/media/video/saa7134/saa7134-video.c | 6 - 25-akpm/drivers/media/video/saa7185.c | 2 25-akpm/drivers/media/video/tda7432.c | 8 +- 25-akpm/drivers/media/video/tda9840.c | 2 25-akpm/drivers/media/video/tda9875.c | 2 25-akpm/drivers/media/video/tda9887.c | 14 ++-- 25-akpm/drivers/media/video/tea6415c.c | 2 25-akpm/drivers/media/video/tea6420.c | 2 25-akpm/drivers/media/video/tuner-3036.c | 2 25-akpm/drivers/media/video/tuner.c | 2 25-akpm/drivers/media/video/tvaudio.c | 28 ++++---- 25-akpm/drivers/media/video/tvmixer.c | 2 25-akpm/drivers/media/video/v4l1-compat.c | 2 25-akpm/drivers/media/video/video-buf.c | 2 25-akpm/drivers/media/video/videocodec.c | 2 25-akpm/drivers/media/video/vpx3220.c | 2 25-akpm/drivers/media/video/w9966.c | 6 - 25-akpm/drivers/media/video/zoran_card.c | 26 +++---- 25-akpm/drivers/media/video/zoran_device.c | 2 25-akpm/drivers/media/video/zoran_driver.c | 2 25-akpm/drivers/media/video/zr36016.c | 2 25-akpm/drivers/media/video/zr36050.c | 2 25-akpm/drivers/media/video/zr36060.c | 4 - 25-akpm/drivers/mtd/devices/blkmtd.c | 8 +- 25-akpm/drivers/mtd/devices/docprobe.c | 2 25-akpm/drivers/mtd/devices/pmc551.c | 9 +- 25-akpm/drivers/mtd/devices/slram.c | 6 - 25-akpm/drivers/mtd/ftl.c | 2 25-akpm/drivers/mtd/maps/scx200_docflash.c | 18 ++--- 25-akpm/drivers/net/3c509.c | 10 +- 25-akpm/drivers/net/3c515.c | 19 ++--- 25-akpm/drivers/net/3c59x.c | 61 +++++++++--------- 25-akpm/drivers/net/82596.c | 8 +- 25-akpm/drivers/net/amd8111e.c | 6 - 25-akpm/drivers/net/appletalk/ipddp.c | 2 25-akpm/drivers/net/arcnet/arcnet.c | 2 25-akpm/drivers/net/atp.c | 10 +- 25-akpm/drivers/net/bonding/bond_main.c | 20 ++--- 25-akpm/drivers/net/de600.c | 6 - 25-akpm/drivers/net/de620.c | 12 +-- 25-akpm/drivers/net/dgrs.c | 16 ++-- 25-akpm/drivers/net/dl2k.c | 20 ++--- 25-akpm/drivers/net/epic100.c | 8 +- 25-akpm/drivers/net/fealnx.c | 12 +-- 25-akpm/drivers/net/hamachi.c | 30 ++++---- 25-akpm/drivers/net/hamradio/baycom_epp.c | 4 - 25-akpm/drivers/net/hamradio/baycom_par.c | 4 - 25-akpm/drivers/net/hamradio/baycom_ser_fdx.c | 8 +- 25-akpm/drivers/net/hamradio/baycom_ser_hdx.c | 6 - 25-akpm/drivers/net/hp100.c | 8 +- 25-akpm/drivers/net/irda/donauboe.c | 4 - 25-akpm/drivers/net/irda/irda-usb.c | 2 25-akpm/drivers/net/irda/irtty-sir.c | 6 - 25-akpm/drivers/net/irda/nsc-ircc.c | 10 +- 25-akpm/drivers/net/irda/tekram-sir.c | 4 - 25-akpm/drivers/net/irda/w83977af_ir.c | 6 - 25-akpm/drivers/net/ixgb/ixgb_param.c | 4 - 25-akpm/drivers/net/natsemi.c | 12 +-- 25-akpm/drivers/net/ne2k-pci.c | 6 - 25-akpm/drivers/net/pcmcia/3c574_cs.c | 4 - 25-akpm/drivers/net/pcmcia/3c589_cs.c | 4 - 25-akpm/drivers/net/pcmcia/axnet_cs.c | 4 - 25-akpm/drivers/net/pcmcia/com20020_cs.c | 14 ++-- 25-akpm/drivers/net/pcmcia/fmvj18x_cs.c | 4 - 25-akpm/drivers/net/pcmcia/nmclan_cs.c | 4 - 25-akpm/drivers/net/pcmcia/pcnet_cs.c | 6 - 25-akpm/drivers/net/pcmcia/smc91c92_cs.c | 4 - 25-akpm/drivers/net/pcmcia/xirc2ps_cs.c | 4 - 25-akpm/drivers/net/plip.c | 4 - 25-akpm/drivers/net/ppp_async.c | 2 25-akpm/drivers/net/sis900.c | 6 - 25-akpm/drivers/net/sk98lin/skge.c | 40 +++++------ 25-akpm/drivers/net/smc-mca.c | 4 - 25-akpm/drivers/net/starfire.c | 18 ++--- 25-akpm/drivers/net/sundance.c | 8 +- 25-akpm/drivers/net/sunhme.c | 2 25-akpm/drivers/net/tlan.c | 21 +++--- 25-akpm/drivers/net/tokenring/3c359.c | 6 - 25-akpm/drivers/net/tokenring/lanstreamer.c | 7 -- 25-akpm/drivers/net/tokenring/olympic.c | 8 +- 25-akpm/drivers/net/tulip/dmfe.c | 18 ++--- 25-akpm/drivers/net/tulip/tulip_core.c | 12 +-- 25-akpm/drivers/net/tulip/winbond-840.c | 12 +-- 25-akpm/drivers/net/typhoon.c | 2 25-akpm/drivers/net/via-velocity.c | 6 - 25-akpm/drivers/net/wan/cosa.c | 6 - 25-akpm/drivers/net/wan/dscc4.c | 4 - 25-akpm/drivers/net/wan/farsync.c | 11 +-- 25-akpm/drivers/net/wan/hostess_sv11.c | 6 - 25-akpm/drivers/net/wan/sealevel.c | 10 +- 25-akpm/drivers/net/wan/syncppp.c | 2 25-akpm/drivers/net/wireless/airo.c | 28 ++++---- 25-akpm/drivers/net/wireless/airo_cs.c | 4 - 25-akpm/drivers/net/wireless/arlan-main.c | 47 ++++++------- 25-akpm/drivers/net/wireless/netwave_cs.c | 10 +- 25-akpm/drivers/net/wireless/orinoco.c | 4 - 25-akpm/drivers/net/wireless/orinoco_cs.c | 6 - 25-akpm/drivers/net/wireless/ray_cs.c | 24 +++---- 25-akpm/drivers/net/wireless/wavelan_cs.p.h | 8 +- 25-akpm/drivers/parport/parport_cs.c | 4 - 25-akpm/drivers/pnp/isapnp/core.c | 8 +- 25-akpm/drivers/scsi/NCR_D700.c | 2 25-akpm/drivers/scsi/aacraid/aachba.c | 14 ++-- 25-akpm/drivers/scsi/aic7xxx/aic79xx_osm.c | 2 25-akpm/drivers/scsi/fdomain.c | 2 25-akpm/drivers/scsi/g_NCR5380.c | 14 ++-- 25-akpm/drivers/scsi/in2000.c | 2 25-akpm/drivers/scsi/nsp32.c | 6 - 25-akpm/drivers/scsi/pcmcia/aha152x_stub.c | 16 ++-- 25-akpm/drivers/scsi/pcmcia/fdomain_stub.c | 6 - 25-akpm/drivers/scsi/pcmcia/nsp_cs.c | 8 +- 25-akpm/drivers/scsi/pcmcia/qlogic_stub.c | 4 - 25-akpm/drivers/scsi/qlogicfas.c | 4 - 25-akpm/drivers/scsi/sim710.c | 2 25-akpm/drivers/scsi/sr.c | 3 25-akpm/drivers/scsi/sr_ioctl.c | 1 25-akpm/drivers/telephony/ixj.c | 6 - 25-akpm/drivers/video/cyber2000fb.c | 2 25-akpm/drivers/video/hgafb.c | 2 25-akpm/drivers/video/matrox/matroxfb_crtc2.c | 2 25-akpm/drivers/video/pm2fb.c | 6 - 25-akpm/drivers/video/sstfb.c | 10 +- 25-akpm/drivers/video/tridentfb.c | 20 ++--- 25-akpm/drivers/video/vfb.c | 4 - 25-akpm/sound/oss/aci.c | 4 - 25-akpm/sound/oss/ad1848.c | 22 +++--- 25-akpm/sound/oss/adlib_card.c | 2 25-akpm/sound/oss/aedsp16.c | 12 +-- 25-akpm/sound/oss/ali5455.c | 13 ++- 25-akpm/sound/oss/awe_wave.c | 6 - 25-akpm/sound/oss/btaudio.c | 18 ++--- 25-akpm/sound/oss/cmpci.c | 22 +++--- 25-akpm/sound/oss/cs4232.c | 20 ++--- 25-akpm/sound/oss/cs4281/cs4281m.c | 6 - 25-akpm/sound/oss/cs46xx.c | 16 ++-- 25-akpm/sound/oss/es1370.c | 4 - 25-akpm/sound/oss/es1371.c | 6 - 25-akpm/sound/oss/gus_card.c | 16 ++-- 25-akpm/sound/oss/i810_audio.c | 8 +- 25-akpm/sound/oss/mad16.c | 26 +++---- 25-akpm/sound/oss/maestro.c | 8 +- 25-akpm/sound/oss/maui.c | 4 - 25-akpm/sound/oss/mpu401.c | 4 - 25-akpm/sound/oss/msnd_pinnacle.c | 35 +++++----- 25-akpm/sound/oss/nm256_audio.c | 8 +- 25-akpm/sound/oss/opl3.c | 2 25-akpm/sound/oss/opl3sa.c | 12 +-- 25-akpm/sound/oss/opl3sa2.c | 20 ++--- 25-akpm/sound/oss/pas2_card.c | 26 +++---- 25-akpm/sound/oss/pss.c | 28 ++++---- 25-akpm/sound/oss/rme96xx.c | 2 25-akpm/sound/oss/sgalaxy.c | 10 +- 25-akpm/sound/oss/sonicvibes.c | 2 25-akpm/sound/oss/soundcard.c | 4 - 25-akpm/sound/oss/sscape.c | 14 ++-- 25-akpm/sound/oss/trix.c | 20 ++--- 25-akpm/sound/oss/uart401.c | 4 - 25-akpm/sound/oss/uart6850.c | 4 - 25-akpm/sound/oss/wavfront.c | 24 +++---- drivers/media/video/msp3400.c | 0 257 files changed, 1030 insertions(+), 1020 deletions(-) diff -puN drivers/acpi/asus_acpi.c~remove-module_parm-from-allyesconfig-almost drivers/acpi/asus_acpi.c --- 25/drivers/acpi/asus_acpi.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.612676680 -0700 +++ 25-akpm/drivers/acpi/asus_acpi.c 2004-10-25 01:37:32.004617096 -0700 @@ -78,9 +78,9 @@ MODULE_LICENSE("GPL"); static uid_t asus_uid; static gid_t asus_gid; -MODULE_PARM(asus_uid, "i"); +module_param(asus_uid, uint, 0); MODULE_PARM_DESC(uid, "UID for entries in /proc/acpi/asus.\n"); -MODULE_PARM(asus_gid, "i"); +module_param(asus_gid, uint, 0); MODULE_PARM_DESC(gid, "GID for entries in /proc/acpi/asus.\n"); diff -puN drivers/block/cpqarray.c~remove-module_parm-from-allyesconfig-almost drivers/block/cpqarray.c --- 25/drivers/block/cpqarray.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.614676376 -0700 +++ 25-akpm/drivers/block/cpqarray.c 2004-10-25 01:37:32.005616944 -0700 @@ -310,7 +310,7 @@ static int ida_proc_get_info(char *buffe } #endif /* CONFIG_PROC_FS */ -MODULE_PARM(eisa, "1-8i"); +module_param_array(eisa, int, NULL, 0); /* This is a bit of a hack, * necessary to support both eisa and pci diff -puN drivers/block/loop.c~remove-module_parm-from-allyesconfig-almost drivers/block/loop.c --- 25/drivers/block/loop.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.615676224 -0700 +++ 25-akpm/drivers/block/loop.c 2004-10-25 01:37:32.006616792 -0700 @@ -1073,7 +1073,7 @@ static struct block_device_operations lo /* * And now the modules code and kernel interface. */ -MODULE_PARM(max_loop, "i"); +module_param(max_loop, int, 0); MODULE_PARM_DESC(max_loop, "Maximum number of loop devices (1-256)"); MODULE_LICENSE("GPL"); MODULE_ALIAS_BLOCKDEV_MAJOR(LOOP_MAJOR); diff -puN drivers/block/nbd.c~remove-module_parm-from-allyesconfig-almost drivers/block/nbd.c --- 25/drivers/block/nbd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.617675920 -0700 +++ 25-akpm/drivers/block/nbd.c 2004-10-25 01:37:32.007616640 -0700 @@ -726,6 +726,6 @@ MODULE_DESCRIPTION("Network Block Device MODULE_LICENSE("GPL"); #ifndef NDEBUG -MODULE_PARM(debugflags, "i"); +module_param(debugflags, int, 0644); MODULE_PARM_DESC(debugflags, "flags for controlling debug output"); #endif diff -puN drivers/block/paride/bpck6.c~remove-module_parm-from-allyesconfig-almost drivers/block/paride/bpck6.c --- 25/drivers/block/paride/bpck6.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.618675768 -0700 +++ 25-akpm/drivers/block/paride/bpck6.c 2004-10-25 01:37:32.007616640 -0700 @@ -277,6 +277,6 @@ static void __exit bpck6_exit(void) MODULE_LICENSE("GPL"); MODULE_AUTHOR("Micro Solutions Inc."); MODULE_DESCRIPTION("BACKPACK Protocol module, compatible with PARIDE"); -MODULE_PARM(verbose,"i"); +module_param(verbose, bool, 0644); module_init(bpck6_init) module_exit(bpck6_exit) diff -puN drivers/block/paride/pcd.c~remove-module_parm-from-allyesconfig-almost drivers/block/paride/pcd.c --- 25/drivers/block/paride/pcd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.619675616 -0700 +++ 25-akpm/drivers/block/paride/pcd.c 2004-10-25 01:37:32.008616488 -0700 @@ -162,14 +162,14 @@ void pcd_setup(char *str, int *ints) #endif -MODULE_PARM(verbose, "i"); -MODULE_PARM(major, "i"); -MODULE_PARM(name, "s"); -MODULE_PARM(nice, "i"); -MODULE_PARM(drive0, "1-6i"); -MODULE_PARM(drive1, "1-6i"); -MODULE_PARM(drive2, "1-6i"); -MODULE_PARM(drive3, "1-6i"); +module_param(verbose, bool, 0644); +module_param(major, int, 0); +module_param(name, charp, 0); +module_param(nice, int, 0); +module_param_array(drive0, int, NULL, 0); +module_param_array(drive1, int, NULL, 0); +module_param_array(drive2, int, NULL, 0); +module_param_array(drive3, int, NULL, 0); #include "paride.h" #include "pseudo.h" diff -puN drivers/block/paride/pd.c~remove-module_parm-from-allyesconfig-almost drivers/block/paride/pd.c --- 25/drivers/block/paride/pd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.621675312 -0700 +++ 25-akpm/drivers/block/paride/pd.c 2004-10-25 01:37:32.009616336 -0700 @@ -178,15 +178,15 @@ void pd_setup(char *str, int *ints) #endif -MODULE_PARM(verbose, "i"); -MODULE_PARM(major, "i"); -MODULE_PARM(name, "s"); -MODULE_PARM(cluster, "i"); -MODULE_PARM(nice, "i"); -MODULE_PARM(drive0, "1-8i"); -MODULE_PARM(drive1, "1-8i"); -MODULE_PARM(drive2, "1-8i"); -MODULE_PARM(drive3, "1-8i"); +module_param(verbose, bool, 0); +module_param(major, int, 0); +module_param(name, charp, 0); +module_param(cluster, int, 0); +module_param(nice, int, 0); +module_param_array(drive0, int, NULL, 0); +module_param_array(drive1, int, NULL, 0); +module_param_array(drive2, int, NULL, 0); +module_param_array(drive3, int, NULL, 0); #include "paride.h" diff -puN drivers/block/paride/pf.c~remove-module_parm-from-allyesconfig-almost drivers/block/paride/pf.c --- 25/drivers/block/paride/pf.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.622675160 -0700 +++ 25-akpm/drivers/block/paride/pf.c 2004-10-25 01:37:32.010616184 -0700 @@ -177,15 +177,15 @@ void pf_setup(char *str, int *ints) #endif -MODULE_PARM(verbose, "i"); -MODULE_PARM(major, "i"); -MODULE_PARM(name, "s"); -MODULE_PARM(cluster, "i"); -MODULE_PARM(nice, "i"); -MODULE_PARM(drive0, "1-7i"); -MODULE_PARM(drive1, "1-7i"); -MODULE_PARM(drive2, "1-7i"); -MODULE_PARM(drive3, "1-7i"); +module_param(verbose, bool, 0644); +module_param(major, int, 0); +module_param(name, charp, 0); +module_param(cluster, int, 0); +module_param(nice, int, 0); +module_param_array(drive0, int, NULL, 0); +module_param_array(drive1, int, NULL, 0); +module_param_array(drive2, int, NULL, 0); +module_param_array(drive3, int, NULL, 0); #include "paride.h" #include "pseudo.h" diff -puN drivers/block/paride/pg.c~remove-module_parm-from-allyesconfig-almost drivers/block/paride/pg.c --- 25/drivers/block/paride/pg.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.624674856 -0700 +++ 25-akpm/drivers/block/paride/pg.c 2004-10-25 01:37:32.011616032 -0700 @@ -184,13 +184,13 @@ void pg_setup(char *str, int *ints) #endif -MODULE_PARM(verbose, "i"); -MODULE_PARM(major, "i"); -MODULE_PARM(name, "s"); -MODULE_PARM(drive0, "1-6i"); -MODULE_PARM(drive1, "1-6i"); -MODULE_PARM(drive2, "1-6i"); -MODULE_PARM(drive3, "1-6i"); +module_param(verbose, bool, 0644); +module_param(major, int, 0); +module_param(name, charp, 0); +module_param_array(drive0, int, NULL, 0); +module_param_array(drive1, int, NULL, 0); +module_param_array(drive2, int, NULL, 0); +module_param_array(drive3, int, NULL, 0); #include "paride.h" diff -puN drivers/block/paride/pt.c~remove-module_parm-from-allyesconfig-almost drivers/block/paride/pt.c --- 25/drivers/block/paride/pt.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.625674704 -0700 +++ 25-akpm/drivers/block/paride/pt.c 2004-10-25 01:37:32.012615880 -0700 @@ -169,13 +169,13 @@ pt_setup(char *str, int *ints) #endif -MODULE_PARM(verbose, "i"); -MODULE_PARM(major, "i"); -MODULE_PARM(name, "s"); -MODULE_PARM(drive0, "1-6i"); -MODULE_PARM(drive1, "1-6i"); -MODULE_PARM(drive2, "1-6i"); -MODULE_PARM(drive3, "1-6i"); +module_param(verbose, bool, 0); +module_param(major, int, 0); +module_param(name, charp, 0); +module_param_array(drive0, int, NULL, 0); +module_param_array(drive1, int, NULL, 0); +module_param_array(drive2, int, NULL, 0); +module_param_array(drive3, int, NULL, 0); #include "paride.h" diff -puN drivers/block/rd.c~remove-module_parm-from-allyesconfig-almost drivers/block/rd.c --- 25/drivers/block/rd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.626674552 -0700 +++ 25-akpm/drivers/block/rd.c 2004-10-25 01:37:32.012615880 -0700 @@ -508,9 +508,9 @@ __setup("ramdisk_blocksize=", ramdisk_bl #endif /* options - modular */ -MODULE_PARM (rd_size, "1i"); +module_param (rd_size, int, 0); MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes."); -MODULE_PARM (rd_blocksize, "i"); +module_param (rd_blocksize, int, 0); MODULE_PARM_DESC(rd_blocksize, "Blocksize of each RAM disk in bytes."); MODULE_LICENSE("GPL"); diff -puN drivers/bluetooth/bluecard_cs.c~remove-module_parm-from-allyesconfig-almost drivers/bluetooth/bluecard_cs.c --- 25/drivers/bluetooth/bluecard_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.628674248 -0700 +++ 25-akpm/drivers/bluetooth/bluecard_cs.c 2004-10-25 01:37:32.013615728 -0700 @@ -57,8 +57,8 @@ static u_int irq_mask = 0x86bc; static int irq_list[4] = { -1 }; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth driver for the Anycom BlueCard (LSE039/LSE041)"); diff -puN drivers/bluetooth/bt3c_cs.c~remove-module_parm-from-allyesconfig-almost drivers/bluetooth/bt3c_cs.c --- 25/drivers/bluetooth/bt3c_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.629674096 -0700 +++ 25-akpm/drivers/bluetooth/bt3c_cs.c 2004-10-25 01:37:32.014615576 -0700 @@ -66,8 +66,8 @@ static u_int irq_mask = 0xffff; static int irq_list[4] = { -1 }; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +module_param(irq_mask, uint, 0); +module_param_array(irq_list, int, NULL, 0); MODULE_AUTHOR("Marcel Holtmann , Jose Orlando Pereira "); MODULE_DESCRIPTION("Bluetooth driver for the 3Com Bluetooth PCMCIA card"); diff -puN drivers/bluetooth/btuart_cs.c~remove-module_parm-from-allyesconfig-almost drivers/bluetooth/btuart_cs.c --- 25/drivers/bluetooth/btuart_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.630673944 -0700 +++ 25-akpm/drivers/bluetooth/btuart_cs.c 2004-10-25 01:37:32.015615424 -0700 @@ -62,8 +62,8 @@ static u_int irq_mask = 0xffff; static int irq_list[4] = { -1 }; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth driver for Bluetooth PCMCIA cards with HCI UART interface"); diff -puN drivers/bluetooth/dtl1_cs.c~remove-module_parm-from-allyesconfig-almost drivers/bluetooth/dtl1_cs.c --- 25/drivers/bluetooth/dtl1_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.632673640 -0700 +++ 25-akpm/drivers/bluetooth/dtl1_cs.c 2004-10-25 01:37:32.015615424 -0700 @@ -62,8 +62,8 @@ static u_int irq_mask = 0xffff; static int irq_list[4] = { -1 }; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth driver for Nokia Connectivity Card DTL-1"); diff -puN drivers/cdrom/aztcd.c~remove-module_parm-from-allyesconfig-almost drivers/cdrom/aztcd.c --- 25/drivers/cdrom/aztcd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.633673488 -0700 +++ 25-akpm/drivers/cdrom/aztcd.c 2004-10-25 01:37:32.017615120 -0700 @@ -288,7 +288,7 @@ static volatile int azt_read_count = 1; static int azt_port = AZT_BASE_ADDR; -MODULE_PARM(azt_port, "i"); +module_param(azt_port, int, 0); static int azt_port_auto[16] = AZT_BASE_AUTO; diff -puN drivers/cdrom/gscd.c~remove-module_parm-from-allyesconfig-almost drivers/cdrom/gscd.c --- 25/drivers/cdrom/gscd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.635673184 -0700 +++ 25-akpm/drivers/cdrom/gscd.c 2004-10-25 01:37:32.018614968 -0700 @@ -70,7 +70,6 @@ #define MAJOR_NR GOLDSTAR_CDROM_MAJOR #include -#define gscd_port gscd /* for compatible parameter passing with "insmod" */ #include "gscd.h" static int gscdPresent = 0; @@ -78,7 +77,7 @@ static int gscdPresent = 0; static unsigned char gscd_buf[2048]; /* buffer for block size conversion */ static int gscd_bn = -1; static short gscd_port = GSCD_BASE_ADDR; -MODULE_PARM(gscd, "h"); +module_param_named(gscd, gscd_port, short, 0); /* Kommt spaeter vielleicht noch mal dran ... * static DECLARE_WAIT_QUEUE_HEAD(gscd_waitq); diff -puN drivers/cdrom/isp16.c~remove-module_parm-from-allyesconfig-almost drivers/cdrom/isp16.c --- 25/drivers/cdrom/isp16.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.636673032 -0700 +++ 25-akpm/drivers/cdrom/isp16.c 2004-10-25 01:37:32.019614816 -0700 @@ -72,10 +72,10 @@ static int isp16_cdrom_irq = ISP16_CDROM static int isp16_cdrom_dma = ISP16_CDROM_DMA; static char *isp16_cdrom_type = ISP16_CDROM_TYPE; -MODULE_PARM(isp16_cdrom_base, "i"); -MODULE_PARM(isp16_cdrom_irq, "i"); -MODULE_PARM(isp16_cdrom_dma, "i"); -MODULE_PARM(isp16_cdrom_type, "s"); +module_param(isp16_cdrom_base, int, 0); +module_param(isp16_cdrom_irq, int, 0); +module_param(isp16_cdrom_dma, int, 0); +module_param(isp16_cdrom_type, charp, 0); #ifdef MODULE void isp16_exit(void); diff -puN drivers/cdrom/mcd.c~remove-module_parm-from-allyesconfig-almost drivers/cdrom/mcd.c --- 25/drivers/cdrom/mcd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.638672728 -0700 +++ 25-akpm/drivers/cdrom/mcd.c 2004-10-25 01:37:32.020614664 -0700 @@ -103,7 +103,6 @@ #include #include -#define mcd_port mcd /* for compatible parameter passing with "insmod" */ #include "mcd.h" /* I added A flag to drop to 1x speed if too many errors 0 = 1X ; 1 = 2X */ @@ -157,7 +156,6 @@ int mitsumi_bug_93_wait; static short mcd_port = CONFIG_MCD_BASE; /* used as "mcd" by "insmod" */ static int mcd_irq = CONFIG_MCD_IRQ; /* must directly follow mcd_port */ -MODULE_PARM(mcd, "1-2i"); static int McdTimeout, McdTries; static DECLARE_WAIT_QUEUE_HEAD(mcd_waitq); @@ -246,7 +244,6 @@ static struct block_device_operations mc static struct gendisk *mcd_gendisk; -#ifndef MODULE static int __init mcd_setup(char *str) { int ints[9]; @@ -265,7 +262,14 @@ static int __init mcd_setup(char *str) __setup("mcd=", mcd_setup); -#endif /* MODULE */ +#ifdef MODULE +static int __init param_set_mcd(const char *val, struct kernel_param *kp) +{ + mcd_setup(val); + return 0; +} +module_param_call(mcd, param_set_mcd, NULL, NULL, 0); +#endif static int mcd_media_changed(struct cdrom_device_info *cdi, int disc_nr) { diff -puN drivers/cdrom/mcdx.c~remove-module_parm-from-allyesconfig-almost drivers/cdrom/mcdx.c --- 25/drivers/cdrom/mcdx.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.639672576 -0700 +++ 25-akpm/drivers/cdrom/mcdx.c 2004-10-25 01:37:32.022614360 -0700 @@ -77,8 +77,6 @@ static const char *mcdx_c_version #include #include -/* for compatible parameter passing with "insmod" */ -#define mcdx_drive_map mcdx #include "mcdx.h" #ifndef HZ @@ -309,7 +307,14 @@ static int mcdx_drive_map[][2] = MCDX_DR static struct s_drive_stuff *mcdx_stuffp[MCDX_NDRIVES]; static spinlock_t mcdx_lock = SPIN_LOCK_UNLOCKED; static struct request_queue *mcdx_queue; -MODULE_PARM(mcdx, "1-4i"); + +/* You can only set the first two pairs, from old MODULE_PARM code. */ +static int mcdx_set(const char *val, struct kernel_param *kp) +{ + get_options((char *)val, 4, (int *)mcdx_drive_map); + return 0; +} +module_param_call(mcdx, mcdx_set, NULL, NULL, 0); static struct cdrom_device_ops mcdx_dops = { .open = mcdx_open, diff -puN drivers/cdrom/optcd.c~remove-module_parm-from-allyesconfig-almost drivers/cdrom/optcd.c --- 25/drivers/cdrom/optcd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.641672272 -0700 +++ 25-akpm/drivers/cdrom/optcd.c 2004-10-25 01:37:32.023614208 -0700 @@ -116,7 +116,7 @@ static void debug(int debug_this, const #define optcd_port optcd /* Needed for the modutils. */ static short optcd_port = OPTCD_PORTBASE; /* I/O base of drive. */ -MODULE_PARM(optcd_port, "h"); +module_param(optcd_port, short, 0); /* Drive registers, read */ #define DATA_PORT optcd_port /* Read data/status */ #define STATUS_PORT optcd_port+1 /* Indicate data/status availability */ diff -puN drivers/cdrom/sjcd.c~remove-module_parm-from-allyesconfig-almost drivers/cdrom/sjcd.c --- 25/drivers/cdrom/sjcd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.642672120 -0700 +++ 25-akpm/drivers/cdrom/sjcd.c 2004-10-25 01:37:32.025613904 -0700 @@ -116,7 +116,7 @@ static struct sjcd_play_msf sjcd_playing static int sjcd_base = SJCD_BASE_ADDR; -MODULE_PARM(sjcd_base, "i"); +module_param(sjcd_base, int, 0); static DECLARE_WAIT_QUEUE_HEAD(sjcd_waitq); diff -puN drivers/cdrom/sonycd535.c~remove-module_parm-from-allyesconfig-almost drivers/cdrom/sonycd535.c --- 25/drivers/cdrom/sonycd535.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.644671816 -0700 +++ 25-akpm/drivers/cdrom/sonycd535.c 2004-10-25 01:37:32.026613752 -0700 @@ -210,7 +210,7 @@ static int do_sony_cmd(Byte * cmd, int n /* The base I/O address of the Sony Interface. This is a variable (not a #define) so it can be easily changed via some future ioctl() */ static unsigned int sony535_cd_base_io = CDU535_ADDRESS; -MODULE_PARM(sony535_cd_base_io, "i"); +module_param(sony535_cd_base_io, int, 0); /* * The following are I/O addresses of the various registers for the drive. The diff -puN drivers/char/agp/amd64-agp.c~remove-module_parm-from-allyesconfig-almost drivers/char/agp/amd64-agp.c --- 25/drivers/char/agp/amd64-agp.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.645671664 -0700 +++ 25-akpm/drivers/char/agp/amd64-agp.c 2004-10-25 01:37:32.027613600 -0700 @@ -674,5 +674,5 @@ module_exit(agp_amd64_cleanup); #endif MODULE_AUTHOR("Dave Jones , Andi Kleen"); -MODULE_PARM(agp_try_unsupported, "1i"); +module_param(agp_try_unsupported, bool, 0); MODULE_LICENSE("GPL"); diff -puN drivers/char/agp/sis-agp.c~remove-module_parm-from-allyesconfig-almost drivers/char/agp/sis-agp.c --- 25/drivers/char/agp/sis-agp.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.647671360 -0700 +++ 25-akpm/drivers/char/agp/sis-agp.c 2004-10-25 01:37:32.027613600 -0700 @@ -351,8 +351,8 @@ static void __exit agp_sis_cleanup(void) module_init(agp_sis_init); module_exit(agp_sis_cleanup); -MODULE_PARM(agp_sis_force_delay,"i"); +module_param(agp_sis_force_delay, bool, 0); MODULE_PARM_DESC(agp_sis_force_delay,"forces sis delay hack"); -MODULE_PARM(agp_sis_agp_spec,"i"); +module_param(agp_sis_agp_spec, int, 0); MODULE_PARM_DESC(agp_sis_agp_spec,"0=force sis init, 1=force generic agp3 init, default: autodetect"); MODULE_LICENSE("GPL and additional rights"); diff -puN drivers/char/applicom.c~remove-module_parm-from-allyesconfig-almost drivers/char/applicom.c --- 25/drivers/char/applicom.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.648671208 -0700 +++ 25-akpm/drivers/char/applicom.c 2004-10-25 01:37:32.028613448 -0700 @@ -79,10 +79,6 @@ MODULE_DEVICE_TABLE(pci, applicom_pci_tb MODULE_AUTHOR("David Woodhouse & Applicom International"); MODULE_DESCRIPTION("Driver for Applicom Profibus card"); MODULE_LICENSE("GPL"); -MODULE_PARM(irq, "i"); -MODULE_PARM_DESC(irq, "IRQ of the Applicom board"); -MODULE_PARM(mem, "i"); -MODULE_PARM_DESC(mem, "Shared Memory Address of Applicom board"); MODULE_SUPPORTED_DEVICE("ac"); @@ -98,6 +94,11 @@ static struct applicom_board { static unsigned int irq = 0; /* interrupt number IRQ */ static unsigned long mem = 0; /* physical segment of board */ +module_param(irq, uint, 0); +MODULE_PARM_DESC(irq, "IRQ of the Applicom board"); +module_param(mem, ulong, 0); +MODULE_PARM_DESC(mem, "Shared Memory Address of Applicom board"); + static unsigned int numboards; /* number of installed boards */ static volatile unsigned char Dummy; static DECLARE_WAIT_QUEUE_HEAD(FlagSleepRec); diff -puN drivers/char/drm/drm_drv.h~remove-module_parm-from-allyesconfig-almost drivers/char/drm/drm_drv.h --- 25/drivers/char/drm/drm_drv.h~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.649671056 -0700 +++ 25-akpm/drivers/char/drm/drm_drv.h 2004-10-25 01:37:32.029613296 -0700 @@ -160,11 +160,11 @@ drm_ioctl_desc_t DRM(ioctls)[] = { #ifdef MODULE static char *drm_opts = NULL; +module_param(drm_opts, charp, 0); #endif MODULE_AUTHOR( DRIVER_AUTHOR ); MODULE_DESCRIPTION( DRIVER_DESC ); -MODULE_PARM( drm_opts, "s" ); MODULE_LICENSE("GPL and additional rights"); static int DRM(setup)( drm_device_t *dev ) diff -puN drivers/char/i8k.c~remove-module_parm-from-allyesconfig-almost drivers/char/i8k.c --- 25/drivers/char/i8k.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.651670752 -0700 +++ 25-akpm/drivers/char/i8k.c 2004-10-25 01:37:32.030613144 -0700 @@ -72,9 +72,9 @@ static int power_status = 0; MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)"); MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops"); MODULE_LICENSE("GPL"); -MODULE_PARM(force, "i"); -MODULE_PARM(restricted, "i"); -MODULE_PARM(power_status, "i"); +module_param(force, bool, 0); +module_param(restricted, bool, 0); +module_param(power_status, bool, 0); MODULE_PARM_DESC(force, "Force loading without checking for supported models"); MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set"); MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k"); diff -puN drivers/char/mwave/mwavedd.c~remove-module_parm-from-allyesconfig-almost drivers/char/mwave/mwavedd.c --- 25/drivers/char/mwave/mwavedd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.652670600 -0700 +++ 25-akpm/drivers/char/mwave/mwavedd.c 2004-10-25 01:37:32.031612992 -0700 @@ -76,11 +76,11 @@ int mwave_3780i_irq = 0; int mwave_3780i_io = 0; int mwave_uart_irq = 0; int mwave_uart_io = 0; -MODULE_PARM(mwave_debug, "i"); -MODULE_PARM(mwave_3780i_irq, "i"); -MODULE_PARM(mwave_3780i_io, "i"); -MODULE_PARM(mwave_uart_irq, "i"); -MODULE_PARM(mwave_uart_io, "i"); +module_param(mwave_debug, int, 0); +module_param(mwave_3780i_irq, int, 0); +module_param(mwave_3780i_io, int, 0); +module_param(mwave_uart_irq, int, 0); +module_param(mwave_uart_io, int, 0); static int mwave_open(struct inode *inode, struct file *file); static int mwave_close(struct inode *inode, struct file *file); diff -puN drivers/char/n_hdlc.c~remove-module_parm-from-allyesconfig-almost drivers/char/n_hdlc.c --- 25/drivers/char/n_hdlc.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.654670296 -0700 +++ 25-akpm/drivers/char/n_hdlc.c 2004-10-25 01:37:32.032612840 -0700 @@ -975,6 +975,6 @@ module_exit(n_hdlc_exit); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Paul Fulghum paulkf@microgate.com"); -MODULE_PARM(debuglevel, "i"); -MODULE_PARM(maxframe, "i"); +module_param(debuglevel, int, 0); +module_param(maxframe, int, 0); MODULE_ALIAS_LDISC(N_HDLC); diff -puN drivers/char/pcmcia/synclink_cs.c~remove-module_parm-from-allyesconfig-almost drivers/char/pcmcia/synclink_cs.c --- 25/drivers/char/pcmcia/synclink_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.655670144 -0700 +++ 25-akpm/drivers/char/pcmcia/synclink_cs.c 2004-10-25 01:37:32.035612384 -0700 @@ -471,14 +471,14 @@ static u_int irq_mask = 0xdeb8; /* Newer, simpler way of listing specific interrupts */ static int irq_list[4] = { -1 }; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); -MODULE_PARM(break_on_load,"i"); -MODULE_PARM(ttymajor,"i"); -MODULE_PARM(debug_level,"i"); -MODULE_PARM(maxframe,"1-" __MODULE_STRING(MAX_DEVICE_COUNT) "i"); -MODULE_PARM(dosyncppp,"1-" __MODULE_STRING(MAX_DEVICE_COUNT) "i"); +module_param(break_on_load, bool, 0); +module_param(ttymajor, int, 0); +module_param(debug_level, int, 0); +module_param_array(maxframe, int, NULL, 0); +module_param_array(dosyncppp, int, NULL, 0); MODULE_LICENSE("GPL"); diff -puN drivers/char/scx200_gpio.c~remove-module_parm-from-allyesconfig-almost drivers/char/scx200_gpio.c --- 25/drivers/char/scx200_gpio.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.657669840 -0700 +++ 25-akpm/drivers/char/scx200_gpio.c 2004-10-25 01:37:32.035612384 -0700 @@ -23,7 +23,7 @@ MODULE_DESCRIPTION("NatSemi SCx200 GPIO MODULE_LICENSE("GPL"); static int major = 0; /* default to dynamic major */ -MODULE_PARM(major, "i"); +module_param(major, int, 0); MODULE_PARM_DESC(major, "Major device number"); static ssize_t scx200_gpio_write(struct file *file, const char __user *data, diff -puN drivers/char/synclink.c~remove-module_parm-from-allyesconfig-almost drivers/char/synclink.c --- 25/drivers/char/synclink.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.660669384 -0700 +++ 25-akpm/drivers/char/synclink.c 2004-10-25 01:37:32.041611472 -0700 @@ -886,16 +886,16 @@ static int dosyncppp[MAX_TOTAL_DEVICES]; static int txdmabufs[MAX_TOTAL_DEVICES]; static int txholdbufs[MAX_TOTAL_DEVICES]; -MODULE_PARM(break_on_load,"i"); -MODULE_PARM(ttymajor,"i"); -MODULE_PARM(io,"1-" __MODULE_STRING(MAX_ISA_DEVICES) "i"); -MODULE_PARM(irq,"1-" __MODULE_STRING(MAX_ISA_DEVICES) "i"); -MODULE_PARM(dma,"1-" __MODULE_STRING(MAX_ISA_DEVICES) "i"); -MODULE_PARM(debug_level,"i"); -MODULE_PARM(maxframe,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i"); -MODULE_PARM(dosyncppp,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i"); -MODULE_PARM(txdmabufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i"); -MODULE_PARM(txholdbufs,"1-" __MODULE_STRING(MAX_TOTAL_DEVICES) "i"); +module_param(break_on_load, bool, 0); +module_param(ttymajor, int, 0); +module_param_array(io, int, NULL, 0); +module_param_array(irq, int, NULL, 0); +module_param_array(dma, int, NULL, 0); +module_param(debug_level, int, 0); +module_param_array(maxframe, int, NULL, 0); +module_param_array(dosyncppp, int, NULL, 0); +module_param_array(txdmabufs, int, NULL, 0); +module_param_array(txholdbufs, int, NULL, 0); static char *driver_name = "SyncLink serial driver"; static char *driver_version = "$Revision: 4.28 $"; diff -puN drivers/char/synclinkmp.c~remove-module_parm-from-allyesconfig-almost drivers/char/synclinkmp.c --- 25/drivers/char/synclinkmp.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.662669080 -0700 +++ 25-akpm/drivers/char/synclinkmp.c 2004-10-25 01:37:32.045610864 -0700 @@ -480,11 +480,11 @@ static int debug_level = 0; static int maxframe[MAX_DEVICES] = {0,}; static int dosyncppp[MAX_DEVICES] = {0,}; -MODULE_PARM(break_on_load,"i"); -MODULE_PARM(ttymajor,"i"); -MODULE_PARM(debug_level,"i"); -MODULE_PARM(maxframe,"1-" __MODULE_STRING(MAX_DEVICES) "i"); -MODULE_PARM(dosyncppp,"1-" __MODULE_STRING(MAX_DEVICES) "i"); +module_param(break_on_load, bool, 0); +module_param(ttymajor, int, 0); +module_param(debug_level, int, 0); +module_param_array(maxframe, int, NULL, 0); +module_param_array(dosyncppp, int, NULL, 0); static char *driver_name = "SyncLink MultiPort driver"; static char *driver_version = "$Revision: 4.29 $"; diff -puN drivers/char/tipar.c~remove-module_parm-from-allyesconfig-almost drivers/char/tipar.c --- 25/drivers/char/tipar.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.663668928 -0700 +++ 25-akpm/drivers/char/tipar.c 2004-10-25 01:37:32.046610712 -0700 @@ -559,7 +559,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE(DRIVER_LICENSE); -MODULE_PARM(timeout, "i"); +module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Timeout (default=1.5 seconds)"); -MODULE_PARM(delay, "i"); +module_param(delay, int, 0); MODULE_PARM_DESC(delay, "Inter-bit delay (default=10 microseconds)"); diff -puN drivers/char/toshiba.c~remove-module_parm-from-allyesconfig-almost drivers/char/toshiba.c --- 25/drivers/char/toshiba.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.665668624 -0700 +++ 25-akpm/drivers/char/toshiba.c 2004-10-25 01:37:32.047610560 -0700 @@ -81,7 +81,7 @@ static int tosh_fan = 0; static int tosh_fn = 0; -MODULE_PARM(tosh_fn, "i"); +module_param(tosh_fn, int, 0); static int tosh_ioctl(struct inode *, struct file *, unsigned int, diff -puN drivers/ide/legacy/ide-cs.c~remove-module_parm-from-allyesconfig-almost drivers/ide/legacy/ide-cs.c --- 25/drivers/ide/legacy/ide-cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.666668472 -0700 +++ 25-akpm/drivers/ide/legacy/ide-cs.c 2004-10-25 01:37:32.047610560 -0700 @@ -62,12 +62,12 @@ MODULE_AUTHOR("David Hinds = level) \ printk(KERN_DEBUG fmt , ## arg) diff -puN drivers/media/common/saa7146_core.c~remove-module_parm-from-allyesconfig-almost drivers/media/common/saa7146_core.c --- 25/drivers/media/common/saa7146_core.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.689664976 -0700 +++ 25-akpm/drivers/media/common/saa7146_core.c 2004-10-25 01:37:32.062608280 -0700 @@ -29,7 +29,7 @@ int saa7146_num = 0; unsigned int saa7146_debug = 0; -MODULE_PARM(saa7146_debug,"i"); +module_param(saa7146_debug, int, 0); MODULE_PARM_DESC(saa7146_debug, "debug level (default: 0)"); #if 0 diff -puN drivers/media/common/saa7146_video.c~remove-module_parm-from-allyesconfig-almost drivers/media/common/saa7146_video.c --- 25/drivers/media/common/saa7146_video.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.690664824 -0700 +++ 25-akpm/drivers/media/common/saa7146_video.c 2004-10-25 01:37:32.063608128 -0700 @@ -2,7 +2,7 @@ static int max_memory = 32; -MODULE_PARM(max_memory,"i"); +module_param(max_memory, int, 0); MODULE_PARM_DESC(max_memory, "maximum memory usage for capture buffers (default: 32Mb)"); #define IS_CAPTURE_ACTIVE(fh) \ diff -puN drivers/media/dvb/frontends/cx22702.c~remove-module_parm-from-allyesconfig-almost drivers/media/dvb/frontends/cx22702.c --- 25/drivers/media/dvb/frontends/cx22702.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.692664520 -0700 +++ 25-akpm/drivers/media/dvb/frontends/cx22702.c 2004-10-25 01:37:32.064607976 -0700 @@ -892,7 +892,7 @@ static void __exit exit_cx22702 (void) module_init (init_cx22702); module_exit (exit_cx22702); -MODULE_PARM(debug,"i"); +module_param(debug, bool, 0644); MODULE_PARM_DESC(debug, "Enable verbose debug messages"); MODULE_DESCRIPTION("CX22702 / Thomson DTT 759x / Thomson DTT 7579 PLL DVB Frontend driver"); MODULE_AUTHOR("Steven Toth"); diff -puN drivers/media/dvb/frontends/dst.c~remove-module_parm-from-allyesconfig-almost drivers/media/dvb/frontends/dst.c --- 25/drivers/media/dvb/frontends/dst.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.693664368 -0700 +++ 25-akpm/drivers/media/dvb/frontends/dst.c 2004-10-25 01:37:32.065607824 -0700 @@ -33,10 +33,10 @@ #include "dst-bt878.h" unsigned int dst_verbose = 0; -MODULE_PARM(dst_verbose, "i"); +module_param(dst_verbose, bool, 0); MODULE_PARM_DESC(dst_verbose, "verbose startup messages, default is 1 (yes)"); unsigned int dst_debug = 0; -MODULE_PARM(dst_debug, "i"); +module_param(dst_debug, bool, 0); MODULE_PARM_DESC(dst_debug, "debug messages, default is 0 (no)"); #define dprintk if (dst_debug) printk diff -puN drivers/media/dvb/frontends/nxt6000.c~remove-module_parm-from-allyesconfig-almost drivers/media/dvb/frontends/nxt6000.c --- 25/drivers/media/dvb/frontends/nxt6000.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.695664064 -0700 +++ 25-akpm/drivers/media/dvb/frontends/nxt6000.c 2004-10-25 01:37:32.066607672 -0700 @@ -41,7 +41,7 @@ MODULE_AUTHOR("Florian Schirmer"); MODULE_LICENSE("GPL"); static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, bool, 0); static struct dvb_frontend_info nxt6000_info = { diff -puN drivers/media/dvb/frontends/ves1x93.c~remove-module_parm-from-allyesconfig-almost drivers/media/dvb/frontends/ves1x93.c --- 25/drivers/media/dvb/frontends/ves1x93.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.696663912 -0700 +++ 25-akpm/drivers/media/dvb/frontends/ves1x93.c 2004-10-25 01:37:32.066607672 -0700 @@ -732,6 +732,6 @@ module_exit(exit_ves1x93); MODULE_DESCRIPTION("VES1x93 DVB-S Frontend"); MODULE_AUTHOR("Ralph Metzler"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug,"i"); -MODULE_PARM(board_type,"i"); +module_param(debug, bool, 0); +module_param(board_type, int, 0); diff -puN drivers/media/radio/miropcm20-radio.c~remove-module_parm-from-allyesconfig-almost drivers/media/radio/miropcm20-radio.c --- 25/drivers/media/radio/miropcm20-radio.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.697663760 -0700 +++ 25-akpm/drivers/media/radio/miropcm20-radio.c 2004-10-25 01:37:32.067607520 -0700 @@ -26,7 +26,7 @@ #include "miropcm20-rds-core.h" static int radio_nr = -1; -MODULE_PARM(radio_nr, "i"); +module_param(radio_nr, int, 0); struct pcm20_device { unsigned long freq; diff -puN drivers/media/radio/radio-aimslab.c~remove-module_parm-from-allyesconfig-almost drivers/media/radio/radio-aimslab.c --- 25/drivers/media/radio/radio-aimslab.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.699663456 -0700 +++ 25-akpm/drivers/media/radio/radio-aimslab.c 2004-10-25 01:37:32.067607520 -0700 @@ -353,9 +353,9 @@ MODULE_AUTHOR("M.Kirkwood"); MODULE_DESCRIPTION("A driver for the RadioTrack/RadioReveal radio card."); MODULE_LICENSE("GPL"); -MODULE_PARM(io, "i"); +module_param(io, int, 0); MODULE_PARM_DESC(io, "I/O address of the RadioTrack card (0x20f or 0x30f)"); -MODULE_PARM(radio_nr, "i"); +module_param(radio_nr, int, 0); static void __exit cleanup_rtrack_module(void) { diff -puN drivers/media/radio/radio-aztech.c~remove-module_parm-from-allyesconfig-almost drivers/media/radio/radio-aztech.c --- 25/drivers/media/radio/radio-aztech.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.700663304 -0700 +++ 25-akpm/drivers/media/radio/radio-aztech.c 2004-10-25 01:37:32.068607368 -0700 @@ -301,8 +301,8 @@ MODULE_AUTHOR("Russell Kroll, Quay Lu, D MODULE_DESCRIPTION("A driver for the Aztech radio card."); MODULE_LICENSE("GPL"); -MODULE_PARM(io, "i"); -MODULE_PARM(radio_nr, "i"); +module_param(io, int, 0); +module_param(radio_nr, int, 0); MODULE_PARM_DESC(io, "I/O address of the Aztech card (0x350 or 0x358)"); static void __exit aztech_cleanup(void) diff -puN drivers/media/radio/radio-cadet.c~remove-module_parm-from-allyesconfig-almost drivers/media/radio/radio-cadet.c --- 25/drivers/media/radio/radio-cadet.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.701663152 -0700 +++ 25-akpm/drivers/media/radio/radio-cadet.c 2004-10-25 01:37:32.069607216 -0700 @@ -604,9 +604,9 @@ MODULE_AUTHOR("Fred Gleason, Russell Kro MODULE_DESCRIPTION("A driver for the ADS Cadet AM/FM/RDS radio card."); MODULE_LICENSE("GPL"); -MODULE_PARM(io, "i"); +module_param(io, int, 0); MODULE_PARM_DESC(io, "I/O address of Cadet card (0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e)"); -MODULE_PARM(radio_nr, "i"); +module_param(radio_nr, int, 0); static void __exit cadet_cleanup_module(void) { diff -puN drivers/media/radio/radio-gemtek.c~remove-module_parm-from-allyesconfig-almost drivers/media/radio/radio-gemtek.c --- 25/drivers/media/radio/radio-gemtek.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.703662848 -0700 +++ 25-akpm/drivers/media/radio/radio-gemtek.c 2004-10-25 01:37:32.069607216 -0700 @@ -284,9 +284,9 @@ MODULE_AUTHOR("Jonas Munsin"); MODULE_DESCRIPTION("A driver for the GemTek Radio Card"); MODULE_LICENSE("GPL"); -MODULE_PARM(io, "i"); +module_param(io, int, 0); MODULE_PARM_DESC(io, "I/O address of the GemTek card (0x20c, 0x30c, 0x24c or 0x34c (0x20c or 0x248 have been reported to work for the combined sound/radiocard))."); -MODULE_PARM(radio_nr, "i"); +module_param(radio_nr, int, 0); static void __exit gemtek_cleanup(void) { diff -puN drivers/media/radio/radio-gemtek-pci.c~remove-module_parm-from-allyesconfig-almost drivers/media/radio/radio-gemtek-pci.c --- 25/drivers/media/radio/radio-gemtek-pci.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.704662696 -0700 +++ 25-akpm/drivers/media/radio/radio-gemtek-pci.c 2004-10-25 01:37:32.070607064 -0700 @@ -294,7 +294,7 @@ static struct pci_device_id gemtek_pci_i MODULE_DEVICE_TABLE( pci, gemtek_pci_id ); -static u8 mx = 1; +static int mx = 1; static struct file_operations gemtek_pci_fops = { .owner = THIS_MODULE, @@ -406,9 +406,9 @@ MODULE_AUTHOR( "Vladimir Shebordaev static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/adv7175.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/adv7175.c --- 25/drivers/media/video/adv7175.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.719660416 -0700 +++ 25-akpm/drivers/media/video/adv7175.c 2004-10-25 01:37:32.076606152 -0700 @@ -57,7 +57,7 @@ MODULE_LICENSE("GPL"); #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/bt819.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/bt819.c --- 25/drivers/media/video/bt819.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.720660264 -0700 +++ 25-akpm/drivers/media/video/bt819.c 2004-10-25 01:37:32.076606152 -0700 @@ -61,7 +61,7 @@ MODULE_LICENSE("GPL"); #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/bt856.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/bt856.c --- 25/drivers/media/video/bt856.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.721660112 -0700 +++ 25-akpm/drivers/media/video/bt856.c 2004-10-25 01:37:32.077606000 -0700 @@ -61,7 +61,7 @@ MODULE_LICENSE("GPL"); #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/btcx-risc.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/btcx-risc.c --- 25/drivers/media/video/btcx-risc.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.723659808 -0700 +++ 25-akpm/drivers/media/video/btcx-risc.c 2004-10-25 01:37:32.077606000 -0700 @@ -38,7 +38,7 @@ MODULE_AUTHOR("Gerd Knorr"); MODULE_LICENSE("GPL"); static unsigned int debug = 0; -MODULE_PARM(debug,"i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug,"debug messages, default is 0 (no)"); /* ---------------------------------------------------------- */ diff -puN drivers/media/video/bttv-cards.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/bttv-cards.c --- 25/drivers/media/video/bttv-cards.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.725659504 -0700 +++ 25-akpm/drivers/media/video/bttv-cards.c 2004-10-25 01:37:32.081605392 -0700 @@ -106,30 +106,30 @@ static unsigned int audioall = UNSET; static unsigned int audiomux[5] = { [ 0 ... 4 ] = UNSET }; /* insmod options */ -MODULE_PARM(triton1,"i"); +module_param(triton1, int, 0); MODULE_PARM_DESC(triton1,"set ETBF pci config bit " "[enable bug compatibility for triton1 + others]"); -MODULE_PARM(vsfx,"i"); +module_param(vsfx, int, 0); MODULE_PARM_DESC(vsfx,"set VSFX pci config bit " "[yet another chipset flaw workaround]"); -MODULE_PARM(no_overlay,"i"); -MODULE_PARM(latency,"i"); +module_param(no_overlay, int, 0); +module_param(latency, int, 0); MODULE_PARM_DESC(latency,"pci latency timer"); -MODULE_PARM(card,"1-" __stringify(BTTV_MAX) "i"); +module_param_array(card, int, NULL, 0); MODULE_PARM_DESC(card,"specify TV/grabber card model, see CARDLIST file for a list"); -MODULE_PARM(pll,"1-" __stringify(BTTV_MAX) "i"); +module_param_array(pll, int, NULL, 0); MODULE_PARM_DESC(pll,"specify installed crystal (0=none, 28=28 MHz, 35=35 MHz)"); -MODULE_PARM(tuner,"1-" __stringify(BTTV_MAX) "i"); +module_param_array(tuner, int, NULL, 0); MODULE_PARM_DESC(tuner,"specify installed tuner type"); -MODULE_PARM(autoload,"i"); +module_param(autoload, int, 0); MODULE_PARM_DESC(autoload,"automatically load i2c modules like tuner.o, default is 1 (yes)"); -MODULE_PARM(svhs,"1-" __stringify(BTTV_MAX) "i"); -MODULE_PARM(remote,"1-" __stringify(BTTV_MAX) "i"); +module_param_array(svhs, int, NULL, 0); +module_param_array(remote, int, NULL, 0); -MODULE_PARM(gpiomask,"i"); -MODULE_PARM(audioall,"i"); -MODULE_PARM(audiomux,"1-6i"); +module_param(gpiomask, int, 0); +module_param(audioall, int, 0); +module_param_array(audiomux, int, NULL, 0); /* kernel args */ #ifndef MODULE diff -puN drivers/media/video/bttv-driver.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/bttv-driver.c --- 25/drivers/media/video/bttv-driver.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.727659200 -0700 +++ 25-akpm/drivers/media/video/bttv-driver.c 2004-10-25 01:37:32.084604936 -0700 @@ -82,48 +82,48 @@ static unsigned int v4l2 = 1; /* insmod args */ -MODULE_PARM(radio,"1-" __stringify(BTTV_MAX) "i"); +module_param_array(radio, bool, NULL, 0); MODULE_PARM_DESC(radio,"The TV card supports radio, default is 0 (no)"); -MODULE_PARM(bigendian,"i"); +module_param(bigendian, int, 0); MODULE_PARM_DESC(bigendian,"byte order of the framebuffer, default is native endian"); -MODULE_PARM(bttv_verbose,"i"); +module_param(bttv_verbose, bool, 0); MODULE_PARM_DESC(bttv_verbose,"verbose startup messages, default is 1 (yes)"); -MODULE_PARM(bttv_gpio,"i"); +module_param(bttv_gpio, bool, 0); MODULE_PARM_DESC(bttv_gpio,"log gpio changes, default is 0 (no)"); -MODULE_PARM(bttv_debug,"i"); +module_param(bttv_debug, bool, 0); MODULE_PARM_DESC(bttv_debug,"debug messages, default is 0 (no)"); -MODULE_PARM(irq_debug,"i"); +module_param(irq_debug, bool, 0); MODULE_PARM_DESC(irq_debug,"irq handler debug messages, default is 0 (no)"); -MODULE_PARM(gbuffers,"i"); +module_param(gbuffers, int, 0); MODULE_PARM_DESC(gbuffers,"number of capture buffers. range 2-32, default 8"); -MODULE_PARM(gbufsize,"i"); +module_param(gbufsize, int, 0); MODULE_PARM_DESC(gbufsize,"size of the capture buffers, default is 0x208000"); -MODULE_PARM(video_nr,"i"); -MODULE_PARM(radio_nr,"i"); -MODULE_PARM(vbi_nr,"i"); -MODULE_PARM(debug_latency,"i"); - -MODULE_PARM(fdsr,"i"); - -MODULE_PARM(combfilter,"i"); -MODULE_PARM(lumafilter,"i"); -MODULE_PARM(automute,"i"); +module_param(video_nr, int, 0); +module_param(radio_nr, int, 0); +module_param(vbi_nr, int, 0); +module_param(debug_latency, int, 0); + +module_param(fdsr, int, 0); + +module_param(combfilter, int, 0); +module_param(lumafilter, int, 0); +module_param(automute, bool, 0); MODULE_PARM_DESC(automute,"mute audio on bad/missing video signal, default is 1 (yes)"); -MODULE_PARM(chroma_agc,"i"); +module_param(chroma_agc, bool, 0); MODULE_PARM_DESC(chroma_agc,"enables the AGC of chroma signal, default is 0 (no)"); -MODULE_PARM(adc_crush,"i"); +module_param(adc_crush, bool, 0); MODULE_PARM_DESC(adc_crush,"enables the luminance ADC crush, default is 1 (yes)"); -MODULE_PARM(whitecrush_upper,"i"); +module_param(whitecrush_upper, int, 0); MODULE_PARM_DESC(whitecrush_upper,"sets the white crush upper value, default is 207"); -MODULE_PARM(whitecrush_lower,"i"); +module_param(whitecrush_lower, int, 0); MODULE_PARM_DESC(whitecrush_lower,"sets the white crush lower value, default is 127"); -MODULE_PARM(vcr_hack,"i"); +module_param(vcr_hack, bool, 0); MODULE_PARM_DESC(vcr_hack,"enables the VCR hack (improves synch on poor VCR tapes), default is 0 (no)"); -MODULE_PARM(irq_iswitch,"i"); +module_param(irq_iswitch, bool, 0); MODULE_PARM_DESC(irq_iswitch,"switch inputs in irq handler"); -MODULE_PARM(v4l2,"i"); +module_param(v4l2, int, 0); MODULE_DESCRIPTION("bttv - v4l/v4l2 driver module for bt848/878 based cards"); MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr"); diff -puN drivers/media/video/bttv-vbi.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/bttv-vbi.c --- 25/drivers/media/video/bttv-vbi.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.728659048 -0700 +++ 25-akpm/drivers/media/video/bttv-vbi.c 2004-10-25 01:37:32.084604936 -0700 @@ -37,9 +37,9 @@ static unsigned int vbibufs = 4; static unsigned int vbi_debug = 0; -MODULE_PARM(vbibufs,"i"); +module_param(vbibufs, int, 0); MODULE_PARM_DESC(vbibufs,"number of vbi buffers, range 2-32, default 4"); -MODULE_PARM(vbi_debug,"i"); +module_param(vbi_debug, bool, 0); MODULE_PARM_DESC(vbi_debug,"vbi code debug messages, default is 0 (no)"); #ifdef dprintk diff -puN drivers/media/video/bw-qcam.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/bw-qcam.c --- 25/drivers/media/video/bw-qcam.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.729658896 -0700 +++ 25-akpm/drivers/media/video/bw-qcam.c 2004-10-25 01:37:32.085604784 -0700 @@ -82,9 +82,9 @@ static unsigned int maxpoll=250; /* Ma static unsigned int yieldlines=4; /* Yield after this many during capture */ static int video_nr = -1; -MODULE_PARM(maxpoll,"i"); -MODULE_PARM(yieldlines,"i"); -MODULE_PARM(video_nr,"i"); +module_param(maxpoll, int, 0); +module_param(yieldlines, int, 0); +module_param(video_nr, int, 0); static inline int read_lpstatus(struct qcam_device *q) { diff -puN drivers/media/video/dpc7146.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/dpc7146.c --- 25/drivers/media/video/dpc7146.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.731658592 -0700 +++ 25-akpm/drivers/media/video/dpc7146.c 2004-10-25 01:37:32.086604632 -0700 @@ -55,7 +55,7 @@ #define DPC_BOARD_CAN_DO_VBI(dev) (dev->revision != 0) static int debug = 0; -MODULE_PARM(debug,"i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "debug verbosity"); /* global variables */ diff -puN drivers/media/video/hexium_gemini.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/hexium_gemini.c --- 25/drivers/media/video/hexium_gemini.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.732658440 -0700 +++ 25-akpm/drivers/media/video/hexium_gemini.c 2004-10-25 01:37:32.086604632 -0700 @@ -26,7 +26,7 @@ #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "debug verbosity"); /* global variables */ diff -puN drivers/media/video/hexium_orion.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/hexium_orion.c --- 25/drivers/media/video/hexium_orion.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.733658288 -0700 +++ 25-akpm/drivers/media/video/hexium_orion.c 2004-10-25 01:37:32.087604480 -0700 @@ -26,7 +26,7 @@ #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "debug verbosity"); /* global variables */ diff -puN drivers/media/video/msp3400.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/msp3400.c diff -puN drivers/media/video/mxb.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/mxb.c --- 25/drivers/media/video/mxb.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.736657832 -0700 +++ 25-akpm/drivers/media/video/mxb.c 2004-10-25 01:37:32.088604328 -0700 @@ -43,11 +43,11 @@ static int mxb_num = 0; in verden (lower saxony, germany) 4148 is a channel called "phoenix" */ static int freq = 4148; -MODULE_PARM(freq,"i"); +module_param(freq, int, 0); MODULE_PARM_DESC(freq, "initial frequency the tuner will be tuned to while setup"); static int debug = 0; -MODULE_PARM(debug,"i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "debug verbosity"); #define MXB_INPUTS 4 diff -puN drivers/media/video/pms.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/pms.c --- 25/drivers/media/video/pms.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.738657528 -0700 +++ 25-akpm/drivers/media/video/pms.c 2004-10-25 01:37:32.089604176 -0700 @@ -1029,9 +1029,9 @@ static int __init init_pms_cards(void) return video_register_device((struct video_device *)&pms_device, VFL_TYPE_GRABBER, video_nr); } -MODULE_PARM(io_port,"i"); -MODULE_PARM(mem_base,"i"); -MODULE_PARM(video_nr,"i"); +module_param(io_port, int, 0); +module_param(mem_base, int, 0); +module_param(video_nr, int, 0); MODULE_LICENSE("GPL"); diff -puN drivers/media/video/saa7110.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7110.c --- 25/drivers/media/video/saa7110.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.739657376 -0700 +++ 25-akpm/drivers/media/video/saa7110.c 2004-10-25 01:37:32.090604024 -0700 @@ -46,7 +46,7 @@ MODULE_LICENSE("GPL"); #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/saa7111.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7111.c --- 25/drivers/media/video/saa7111.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.740657224 -0700 +++ 25-akpm/drivers/media/video/saa7111.c 2004-10-25 01:37:32.090604024 -0700 @@ -60,7 +60,7 @@ MODULE_LICENSE("GPL"); #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/saa7114.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7114.c --- 25/drivers/media/video/saa7114.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.742656920 -0700 +++ 25-akpm/drivers/media/video/saa7114.c 2004-10-25 01:37:32.091603872 -0700 @@ -63,7 +63,7 @@ MODULE_LICENSE("GPL"); #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/saa7134/saa7134-core.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7134/saa7134-core.c --- 25/drivers/media/video/saa7134/saa7134-core.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.743656768 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-core.c 2004-10-25 01:37:32.093603568 -0700 @@ -43,55 +43,55 @@ MODULE_LICENSE("GPL"); /* ------------------------------------------------------------------ */ static unsigned int irq_debug = 0; -MODULE_PARM(irq_debug,"i"); +module_param(irq_debug, int, 0); MODULE_PARM_DESC(irq_debug,"enable debug messages [IRQ handler]"); static unsigned int core_debug = 0; -MODULE_PARM(core_debug,"i"); +module_param(core_debug, int, 0); MODULE_PARM_DESC(core_debug,"enable debug messages [core]"); static unsigned int gpio_tracking = 0; -MODULE_PARM(gpio_tracking,"i"); +module_param(gpio_tracking, int, 0); MODULE_PARM_DESC(gpio_tracking,"enable debug messages [gpio]"); static unsigned int video_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -MODULE_PARM(video_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +module_param_array(video_nr, int, NULL, 0); MODULE_PARM_DESC(video_nr,"video device number"); static unsigned int ts_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -MODULE_PARM(ts_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +module_param_array(ts_nr, int, NULL, 0); MODULE_PARM_DESC(ts_nr,"ts device number"); static unsigned int vbi_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -MODULE_PARM(vbi_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +module_param_array(vbi_nr, int, NULL, 0); MODULE_PARM_DESC(vbi_nr,"vbi device number"); static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -MODULE_PARM(radio_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +module_param_array(radio_nr, int, NULL, 0); MODULE_PARM_DESC(radio_nr,"radio device number"); static unsigned int oss = 0; -MODULE_PARM(oss,"i"); +module_param(oss, int, 0); MODULE_PARM_DESC(oss,"register oss devices (default: no)"); static unsigned int dsp_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -MODULE_PARM(dsp_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +module_param_array(dsp_nr, int, NULL, 0); MODULE_PARM_DESC(dsp_nr,"oss dsp device number"); static unsigned int mixer_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -MODULE_PARM(mixer_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +module_param_array(mixer_nr, int, NULL, 0); MODULE_PARM_DESC(mixer_nr,"oss mixer device number"); static unsigned int tuner[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -MODULE_PARM(tuner,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +module_param_array(tuner, int, NULL, 0); MODULE_PARM_DESC(tuner,"tuner type"); static unsigned int card[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -MODULE_PARM(card,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +module_param_array(card, int, NULL, 0); MODULE_PARM_DESC(card,"card type"); static unsigned int latency = UNSET; -MODULE_PARM(latency,"i"); +module_param(latency, int, 0); MODULE_PARM_DESC(latency,"pci latency timer"); struct list_head saa7134_devlist; diff -puN drivers/media/video/saa7134/saa7134-i2c.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7134/saa7134-i2c.c --- 25/drivers/media/video/saa7134/saa7134-i2c.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.745656464 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-i2c.c 2004-10-25 01:37:32.093603568 -0700 @@ -34,11 +34,11 @@ /* ----------------------------------------------------------- */ static unsigned int i2c_debug = 0; -MODULE_PARM(i2c_debug,"i"); +module_param(i2c_debug, int, 0); MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]"); static unsigned int i2c_scan = 0; -MODULE_PARM(i2c_scan,"i"); +module_param(i2c_scan, int, 0); MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); #define d1printk if (1 == i2c_debug) printk diff -puN drivers/media/video/saa7134/saa7134-input.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7134/saa7134-input.c --- 25/drivers/media/video/saa7134/saa7134-input.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.746656312 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-input.c 2004-10-25 01:37:32.094603416 -0700 @@ -30,11 +30,11 @@ #include "saa7134.h" static unsigned int disable_ir = 0; -MODULE_PARM(disable_ir,"i"); +module_param(disable_ir, bool, 0); MODULE_PARM_DESC(disable_ir,"disable infrared remote support"); static unsigned int ir_debug = 0; -MODULE_PARM(ir_debug,"i"); +module_param(ir_debug, bool, 0); MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]"); #define dprintk(fmt, arg...) if (ir_debug) \ diff -puN drivers/media/video/saa7134/saa7134-oss.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7134/saa7134-oss.c --- 25/drivers/media/video/saa7134/saa7134-oss.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.747656160 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-oss.c 2004-10-25 01:37:32.094603416 -0700 @@ -34,11 +34,11 @@ /* ------------------------------------------------------------------ */ static unsigned int oss_debug = 0; -MODULE_PARM(oss_debug,"i"); +module_param(oss_debug, int, 0); MODULE_PARM_DESC(oss_debug,"enable debug messages [oss]"); static unsigned int oss_rate = 0; -MODULE_PARM(oss_rate,"i"); +module_param(oss_rate, int, 0); MODULE_PARM_DESC(oss_rate,"sample rate (valid are: 32000,48000)"); #define dprintk(fmt, arg...) if (oss_debug) \ diff -puN drivers/media/video/saa7134/saa7134-ts.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7134/saa7134-ts.c --- 25/drivers/media/video/saa7134/saa7134-ts.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.749655856 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-ts.c 2004-10-25 01:37:32.095603264 -0700 @@ -38,15 +38,15 @@ #define TS_PACKET_SIZE 188 /* TS packets 188 bytes */ static unsigned int ts_debug = 0; -MODULE_PARM(ts_debug,"i"); +module_param(ts_debug, int, 0); MODULE_PARM_DESC(ts_debug,"enable debug messages [ts]"); static unsigned int tsbufs = 4; -MODULE_PARM(tsbufs,"i"); +module_param(tsbufs, int, 0); MODULE_PARM_DESC(tsbufs,"number of ts buffers, range 2-32"); static unsigned int ts_nr_packets = 30; -MODULE_PARM(ts_nr_packets,"i"); +module_param(ts_nr_packets, int, 0); MODULE_PARM_DESC(ts_nr_packets,"size of a ts buffers (in ts packets)"); #define dprintk(fmt, arg...) if (ts_debug) \ diff -puN drivers/media/video/saa7134/saa7134-tvaudio.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7134/saa7134-tvaudio.c --- 25/drivers/media/video/saa7134/saa7134-tvaudio.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.750655704 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-tvaudio.c 2004-10-25 01:37:32.096603112 -0700 @@ -36,18 +36,18 @@ /* ------------------------------------------------------------------ */ static unsigned int audio_debug = 0; -MODULE_PARM(audio_debug,"i"); +module_param(audio_debug, int, 0); MODULE_PARM_DESC(audio_debug,"enable debug messages [tv audio]"); static unsigned int audio_ddep = 0; -MODULE_PARM(audio_ddep,"i"); +module_param(audio_ddep, int, 0); MODULE_PARM_DESC(audio_ddep,"audio ddep overwrite"); static int audio_clock_override = UNSET; -MODULE_PARM(audio_clock_override, "i"); +module_param(audio_clock_override, int, 0); static int audio_clock_tweak = 0; -MODULE_PARM(audio_clock_tweak, "i"); +module_param(audio_clock_tweak, int, 0); MODULE_PARM_DESC(audio_clock_tweak, "Audio clock tick fine tuning for cards with audio crystal that's slightly off (range [-1024 .. 1024])"); #define dprintk(fmt, arg...) if (audio_debug) \ diff -puN drivers/media/video/saa7134/saa7134-vbi.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7134/saa7134-vbi.c --- 25/drivers/media/video/saa7134/saa7134-vbi.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.752655400 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-vbi.c 2004-10-25 01:37:32.097602960 -0700 @@ -33,11 +33,11 @@ /* ------------------------------------------------------------------ */ static unsigned int vbi_debug = 0; -MODULE_PARM(vbi_debug,"i"); +module_param(vbi_debug, int, 0); MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]"); static unsigned int vbibufs = 4; -MODULE_PARM(vbibufs,"i"); +module_param(vbibufs, int, 0); MODULE_PARM_DESC(vbibufs,"number of vbi buffers, range 2-32"); #define dprintk(fmt, arg...) if (vbi_debug) \ diff -puN drivers/media/video/saa7134/saa7134-video.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7134/saa7134-video.c --- 25/drivers/media/video/saa7134/saa7134-video.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.754655096 -0700 +++ 25-akpm/drivers/media/video/saa7134/saa7134-video.c 2004-10-25 01:37:32.098602808 -0700 @@ -39,11 +39,11 @@ static unsigned int gbuffers = 8; static unsigned int noninterlaced = 0; static unsigned int gbufsize = 720*576*4; static unsigned int gbufsize_max = 720*576*4; -MODULE_PARM(video_debug,"i"); +module_param(video_debug, bool, 0); MODULE_PARM_DESC(video_debug,"enable debug messages [video]"); -MODULE_PARM(gbuffers,"i"); +module_param(gbuffers, int, 0); MODULE_PARM_DESC(gbuffers,"number of capture buffers, range 2-32"); -MODULE_PARM(noninterlaced,"i"); +module_param(noninterlaced, bool, 0); MODULE_PARM_DESC(noninterlaced,"video input is noninterlaced"); #define dprintk(fmt, arg...) if (video_debug) \ diff -puN drivers/media/video/saa7185.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/saa7185.c --- 25/drivers/media/video/saa7185.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.755654944 -0700 +++ 25-akpm/drivers/media/video/saa7185.c 2004-10-25 01:37:32.099602656 -0700 @@ -57,7 +57,7 @@ MODULE_LICENSE("GPL"); #include static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/tda7432.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/tda7432.c --- 25/drivers/media/video/tda7432.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.756654792 -0700 +++ 25-akpm/drivers/media/video/tda7432.c 2004-10-25 01:37:32.100602504 -0700 @@ -60,14 +60,14 @@ MODULE_AUTHOR("Eric Sandeen #include -MODULE_PARM(debug,"i"); MODULE_LICENSE("GPL"); static int debug = 0; /* insmod parameter */ +module_param(debug, int, 0); /* Addresses to scan */ static unsigned short normal_i2c[] = { diff -puN drivers/media/video/tda9887.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/tda9887.c --- 25/drivers/media/video/tda9887.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.760654184 -0700 +++ 25-akpm/drivers/media/video/tda9887.c 2004-10-25 01:37:32.102602200 -0700 @@ -36,7 +36,7 @@ I2C_CLIENT_INSMOD; /* insmod options */ static unsigned int debug = 0; -MODULE_PARM(debug,"i"); +module_param(debug, int, 0); MODULE_LICENSE("GPL"); /* ---------------------------------------------------------------------- */ @@ -377,10 +377,10 @@ static unsigned int port1 = 1; static unsigned int port2 = 1; static unsigned int qss = UNSET; static unsigned int adjust = 0x10; -MODULE_PARM(port1,"i"); -MODULE_PARM(port2,"i"); -MODULE_PARM(qss,"i"); -MODULE_PARM(adjust,"i"); +module_param(port1, int, 0); +module_param(port2, int, 0); +module_param(qss, int, 0); +module_param(adjust, int, 0); static int tda9887_set_insmod(struct tda9887 *t, char *buf) { @@ -461,9 +461,9 @@ static int tda9887_set_pinnacle(struct t /* ---------------------------------------------------------------------- */ static char *pal = "-"; -MODULE_PARM(pal,"s"); +module_param(pal, charp, 0); static char *secam = "-"; -MODULE_PARM(secam,"s"); +module_param(secam, charp, 0); static int tda9887_fixup_std(struct tda9887 *t) { diff -puN drivers/media/video/tea6415c.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/tea6415c.c --- 25/drivers/media/video/tea6415c.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.762653880 -0700 +++ 25-akpm/drivers/media/video/tea6415c.c 2004-10-25 01:37:32.102602200 -0700 @@ -36,7 +36,7 @@ #include "tea6415c.h" static int debug = 0; /* insmod parameter */ -MODULE_PARM(debug,"i"); +module_param(debug, bool, 0); #define dprintk if (debug) printk #define TEA6415C_NUM_INPUTS 8 diff -puN drivers/media/video/tea6420.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/tea6420.c --- 25/drivers/media/video/tea6420.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.763653728 -0700 +++ 25-akpm/drivers/media/video/tea6420.c 2004-10-25 01:37:32.102602200 -0700 @@ -37,7 +37,7 @@ #include "tea6420.h" static int debug = 0; /* insmod parameter */ -MODULE_PARM(debug,"i"); +module_param(debug, bool, 0); #define dprintk if (debug) printk /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */ diff -puN drivers/media/video/tuner-3036.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/tuner-3036.c --- 25/drivers/media/video/tuner-3036.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.764653576 -0700 +++ 25-akpm/drivers/media/video/tuner-3036.c 2004-10-25 01:37:32.103602048 -0700 @@ -214,7 +214,7 @@ MODULE_DESCRIPTION("SAB3036 tuner driver MODULE_AUTHOR("Philip Blundell "); MODULE_LICENSE("GPL"); -MODULE_PARM(debug,"i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug,"Enable debugging output"); module_init(tuner3036_init); diff -puN drivers/media/video/tuner.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/tuner.c --- 25/drivers/media/video/tuner.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.766653272 -0700 +++ 25-akpm/drivers/media/video/tuner.c 2004-10-25 01:37:32.104601896 -0700 @@ -1103,7 +1103,7 @@ static void set_type(struct i2c_client * } static char *pal = "-"; -MODULE_PARM(pal,"s"); +module_param(pal, charp, 0); static int tuner_fixup_std(struct tuner *t) { diff -puN drivers/media/video/tvaudio.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/tvaudio.c --- 25/drivers/media/video/tvaudio.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.768652968 -0700 +++ 25-akpm/drivers/media/video/tvaudio.c 2004-10-25 01:37:32.105601744 -0700 @@ -37,8 +37,8 @@ /* ---------------------------------------------------------------------- */ /* insmod args */ -MODULE_PARM(debug,"i"); static int debug = 0; /* insmod parameter */ +module_param(debug, bool, 0); MODULE_DESCRIPTION("device driver for various i2c TV sound decoder / audiomux chips"); MODULE_AUTHOR("Eric Sandeen, Steve VanDeBogart, Greg Alexander, Gerd Knorr"); @@ -764,9 +764,9 @@ static int tda9874a_dic = -1; /* device static unsigned int tda9874a_SIF = UNSET; static unsigned int tda9874a_AMSEL = UNSET; static unsigned int tda9874a_STD = UNSET; -MODULE_PARM(tda9874a_SIF,"i"); -MODULE_PARM(tda9874a_AMSEL,"i"); -MODULE_PARM(tda9874a_STD,"i"); +module_param(tda9874a_SIF, int, 0); +module_param(tda9874a_AMSEL, int, 0); +module_param(tda9874a_STD, int, 0); /* * initialization table for tda9874 decoder: @@ -1218,16 +1218,16 @@ int tea6420 = 1; int pic16c54 = 1; int ta8874z = 0; // address clash with tda9840 -MODULE_PARM(tda8425,"i"); -MODULE_PARM(tda9840,"i"); -MODULE_PARM(tda9850,"i"); -MODULE_PARM(tda9855,"i"); -MODULE_PARM(tda9873,"i"); -MODULE_PARM(tda9874a,"i"); -MODULE_PARM(tea6300,"i"); -MODULE_PARM(tea6420,"i"); -MODULE_PARM(pic16c54,"i"); -MODULE_PARM(ta8874z,"i"); +module_param(tda8425, bool, 0); +module_param(tda9840, bool, 0); +module_param(tda9850, bool, 0); +module_param(tda9855, bool, 0); +module_param(tda9873, bool, 0); +module_param(tda9874a, bool, 0); +module_param(tea6300, bool, 0); +module_param(tea6420, bool, 0); +module_param(pic16c54, bool, 0); +module_param(ta8874z, bool, 0); static struct CHIPDESC chiplist[] = { { diff -puN drivers/media/video/tvmixer.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/tvmixer.c --- 25/drivers/media/video/tvmixer.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.769652816 -0700 +++ 25-akpm/drivers/media/video/tvmixer.c 2004-10-25 01:37:32.106601592 -0700 @@ -20,7 +20,7 @@ #define DEV_MAX 4 static int devnr = -1; -MODULE_PARM(devnr,"i"); +module_param(devnr, int, 0); MODULE_AUTHOR("Gerd Knorr"); MODULE_LICENSE("GPL"); diff -puN drivers/media/video/v4l1-compat.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/v4l1-compat.c --- 25/drivers/media/video/v4l1-compat.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.770652664 -0700 +++ 25-akpm/drivers/media/video/v4l1-compat.c 2004-10-25 01:37:32.107601440 -0700 @@ -44,7 +44,7 @@ #endif static unsigned int debug = 0; -MODULE_PARM(debug,"i"); +module_param(debug, bool, 0); MODULE_PARM_DESC(debug,"enable debug messages"); MODULE_AUTHOR("Bill Dirks"); MODULE_DESCRIPTION("v4l(1) compatibility layer for v4l2 drivers."); diff -puN drivers/media/video/video-buf.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/video-buf.c --- 25/drivers/media/video/video-buf.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.772652360 -0700 +++ 25-akpm/drivers/media/video/video-buf.c 2004-10-25 01:37:32.108601288 -0700 @@ -40,7 +40,7 @@ static int debug = 0; MODULE_DESCRIPTION("helper module to manage video4linux pci dma buffers"); MODULE_AUTHOR("Gerd Knorr [SuSE Labs]"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug,"i"); +module_param(debug, int, 0); #define dprintk(level, fmt, arg...) if (debug >= level) \ printk(KERN_DEBUG "vbuf: " fmt , ## arg) diff -puN drivers/media/video/videocodec.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/videocodec.c --- 25/drivers/media/video/videocodec.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.773652208 -0700 +++ 25-akpm/drivers/media/video/videocodec.c 2004-10-25 01:37:32.109601136 -0700 @@ -46,7 +46,7 @@ #include "videocodec.h" static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-4)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/vpx3220.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/vpx3220.c --- 25/drivers/media/video/vpx3220.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.775651904 -0700 +++ 25-akpm/drivers/media/video/vpx3220.c 2004-10-25 01:37:32.109601136 -0700 @@ -41,7 +41,7 @@ #define VPX3220_DEBUG KERN_DEBUG "vpx3220: " static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/w9966.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/w9966.c --- 25/drivers/media/video/w9966.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.776651752 -0700 +++ 25-akpm/drivers/media/video/w9966.c 2004-10-25 01:37:32.110600984 -0700 @@ -127,18 +127,18 @@ static const char* pardev[] = {[0 ... W9 #else static const char* pardev[] = {[0 ... W9966_MAXCAMS] = "aggressive"}; #endif -MODULE_PARM(pardev, "1-" __MODULE_STRING(W9966_MAXCAMS) "s"); +module_param_array(pardev, charp, NULL, 0); MODULE_PARM_DESC(pardev, "pardev: where to search for\n\ \teach camera. 'aggressive' means brute-force search.\n\ \tEg: >pardev=parport3,aggressive,parport2,parport1< would assign\n\ \tcam 1 to parport3 and search every parport for cam 2 etc..."); static int parmode = 0; -MODULE_PARM(parmode, "i"); +module_param(parmode, int, 0); MODULE_PARM_DESC(parmode, "parmode: transfer mode (0=auto, 1=ecp, 2=epp"); static int video_nr = -1; -MODULE_PARM(video_nr, "i"); +module_param(video_nr, int, 0); /* * Private data diff -puN drivers/media/video/zoran_card.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/zoran_card.c --- 25/drivers/media/video/zoran_card.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.777651600 -0700 +++ 25-akpm/drivers/media/video/zoran_card.c 2004-10-25 01:37:32.112600680 -0700 @@ -61,15 +61,15 @@ extern const struct zoran_format zoran_f extern const int zoran_num_formats; static int card[BUZ_MAX] = { -1, -1, -1, -1 }; -MODULE_PARM(card, "1-" __stringify(BUZ_MAX) "i"); +module_param_array(card, int, NULL, 0); MODULE_PARM_DESC(card, "The type of card"); static int encoder[BUZ_MAX] = { -1, -1, -1, -1 }; -MODULE_PARM(encoder, "1-" __stringify(BUZ_MAX) "i"); +module_param_array(encoder, int, NULL, 0); MODULE_PARM_DESC(encoder, "i2c TV encoder"); static int decoder[BUZ_MAX] = { -1, -1, -1, -1 }; -MODULE_PARM(decoder, "1-" __stringify(BUZ_MAX) "i"); +module_param_array(decoder, int, NULL, 0); MODULE_PARM_DESC(decoder, "i2c TV decoder"); /* @@ -81,23 +81,23 @@ MODULE_PARM_DESC(decoder, "i2c TV decode */ static unsigned long vidmem = 0; /* Video memory base address */ -MODULE_PARM(vidmem, "i"); +module_param(vidmem, ulong, 0); /* Default input and video norm at startup of the driver. */ static int default_input = 0; /* 0=Composite, 1=S-Video */ -MODULE_PARM(default_input, "i"); +module_param(default_input, int, 0); MODULE_PARM_DESC(default_input, "Default input (0=Composite, 1=S-Video, 2=Internal)"); static int default_norm = 0; /* 0=PAL, 1=NTSC 2=SECAM */ -MODULE_PARM(default_norm, "i"); +module_param(default_norm, int, 0); MODULE_PARM_DESC(default_norm, "Default norm (0=PAL, 1=NTSC, 2=SECAM)"); static int video_nr = -1; /* /dev/videoN, -1 for autodetect */ -MODULE_PARM(video_nr, "i"); +module_param(video_nr, int, 0); MODULE_PARM_DESC(video_nr, "video device number"); /* @@ -119,27 +119,27 @@ MODULE_PARM_DESC(video_nr, "video device int v4l_nbufs = 2; int v4l_bufsize = 128; /* Everybody should be able to work with this setting */ -MODULE_PARM(v4l_nbufs, "i"); +module_param(v4l_nbufs, int, 0); MODULE_PARM_DESC(v4l_nbufs, "Maximum number of V4L buffers to use"); -MODULE_PARM(v4l_bufsize, "i"); +module_param(v4l_bufsize, int, 0); MODULE_PARM_DESC(v4l_bufsize, "Maximum size per V4L buffer (in kB)"); int jpg_nbufs = 32; int jpg_bufsize = 512; /* max size for 100% quality full-PAL frame */ -MODULE_PARM(jpg_nbufs, "i"); +module_param(jpg_nbufs, int, 0); MODULE_PARM_DESC(jpg_nbufs, "Maximum number of JPG buffers to use"); -MODULE_PARM(jpg_bufsize, "i"); +module_param(jpg_bufsize, int, 0); MODULE_PARM_DESC(jpg_bufsize, "Maximum size per JPG buffer (in kB)"); int pass_through = 0; /* 1=Pass through TV signal when device is not used */ /* 0=Show color bar when device is not used (LML33: only if lml33dpath=1) */ -MODULE_PARM(pass_through, "i"); +module_param(pass_through, int, 0); MODULE_PARM_DESC(pass_through, "Pass TV signal through to TV-out when idling"); static int debug = 1; int *zr_debug = &debug; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-4)"); MODULE_DESCRIPTION("Zoran-36057/36067 JPEG codec driver"); diff -puN drivers/media/video/zoran_device.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/zoran_device.c --- 25/drivers/media/video/zoran_device.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.779651296 -0700 +++ 25-akpm/drivers/media/video/zoran_device.c 2004-10-25 01:37:32.113600528 -0700 @@ -76,7 +76,7 @@ static int lml33dpath = 0; /* 1 will use * load on Bt819 input, there will be * some image imperfections */ -MODULE_PARM(lml33dpath, "i"); +module_param(lml33dpath, bool, 0); MODULE_PARM_DESC(lml33dpath, "Use digital path capture mode (on LML33 cards)"); diff -puN drivers/media/video/zoran_driver.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/zoran_driver.c --- 25/drivers/media/video/zoran_driver.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.781650992 -0700 +++ 25-akpm/drivers/media/video/zoran_driver.c 2004-10-25 01:37:32.116600072 -0700 @@ -204,7 +204,7 @@ extern int jpg_bufsize; extern int pass_through; static int lock_norm = 0; /* 1=Don't change TV standard (norm) */ -MODULE_PARM(lock_norm, "i"); +module_param(lock_norm, int, 0); MODULE_PARM_DESC(lock_norm, "Users can't change norm"); #ifdef HAVE_V4L2 diff -puN drivers/media/video/zr36016.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/zr36016.c --- 25/drivers/media/video/zr36016.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.782650840 -0700 +++ 25-akpm/drivers/media/video/zr36016.c 2004-10-25 01:37:32.117599920 -0700 @@ -61,7 +61,7 @@ static int zr36016_codecs = 0; /* debugging is available via module parameter */ static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-4)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/zr36050.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/zr36050.c --- 25/drivers/media/video/zr36050.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.784650536 -0700 +++ 25-akpm/drivers/media/video/zr36050.c 2004-10-25 01:37:32.118599768 -0700 @@ -58,7 +58,7 @@ static int zr36050_codecs = 0; /* debugging is available via module parameter */ static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-4)"); #define dprintk(num, format, args...) \ diff -puN drivers/media/video/zr36060.c~remove-module_parm-from-allyesconfig-almost drivers/media/video/zr36060.c --- 25/drivers/media/video/zr36060.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.785650384 -0700 +++ 25-akpm/drivers/media/video/zr36060.c 2004-10-25 01:37:32.119599616 -0700 @@ -56,12 +56,12 @@ static int zr36060_codecs = 0; static int low_bitrate = 0; -MODULE_PARM(low_bitrate, "i"); +module_param(low_bitrate, bool, 0); MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate"); /* debugging is available via module parameter */ static int debug = 0; -MODULE_PARM(debug, "i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug, "Debug level (0-4)"); #define dprintk(num, format, args...) \ diff -puN drivers/mtd/devices/blkmtd.c~remove-module_parm-from-allyesconfig-almost drivers/mtd/devices/blkmtd.c --- 25/drivers/mtd/devices/blkmtd.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.786650232 -0700 +++ 25-akpm/drivers/mtd/devices/blkmtd.c 2004-10-25 01:37:32.120599464 -0700 @@ -68,13 +68,13 @@ int sync; MODULE_LICENSE("GPL"); MODULE_AUTHOR("Simon Evans "); MODULE_DESCRIPTION("Emulate an MTD using a block device"); -MODULE_PARM(device, "1-4s"); +module_param_array(device, charp, NULL, 0); MODULE_PARM_DESC(device, "block device to use"); -MODULE_PARM(erasesz, "1-4i"); +module_param_array(erasesz, int, NULL, 0); MODULE_PARM_DESC(erasesz, "optional erase size to use in KiB. eg 4=4KiB."); -MODULE_PARM(ro, "1-4i"); +module_param_array(ro, bool, NULL, 0); MODULE_PARM_DESC(ro, "1=Read only, writes and erases cause errors"); -MODULE_PARM(sync, "i"); +module_param(sync, bool, 0); MODULE_PARM_DESC(sync, "1=Synchronous writes"); diff -puN drivers/mtd/devices/docprobe.c~remove-module_parm-from-allyesconfig-almost drivers/mtd/devices/docprobe.c --- 25/drivers/mtd/devices/docprobe.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.788649928 -0700 +++ 25-akpm/drivers/mtd/devices/docprobe.c 2004-10-25 01:37:32.120599464 -0700 @@ -62,7 +62,7 @@ static unsigned long doc_config_location = CONFIG_MTD_DOCPROBE_ADDRESS; -MODULE_PARM(doc_config_location, "l"); +module_param(doc_config_location, ulong, 0); MODULE_PARM_DESC(doc_config_location, "Physical memory address at which to probe for DiskOnChip"); static unsigned long __initdata doc_locations[] = { diff -puN drivers/mtd/devices/pmc551.c~remove-module_parm-from-allyesconfig-almost drivers/mtd/devices/pmc551.c --- 25/drivers/mtd/devices/pmc551.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.789649776 -0700 +++ 25-akpm/drivers/mtd/devices/pmc551.c 2004-10-25 01:37:32.121599312 -0700 @@ -630,10 +630,6 @@ static u32 fixup_pmc551 (struct pci_dev MODULE_LICENSE("GPL"); MODULE_AUTHOR("Mark Ferrell "); MODULE_DESCRIPTION(PMC551_VERSION); -MODULE_PARM(msize, "i"); -MODULE_PARM_DESC(msize, "memory size in Megabytes [1 - 1024]"); -MODULE_PARM(asize, "i"); -MODULE_PARM_DESC(asize, "aperture size, must be <= memsize [1-1024]"); /* * Stuff these outside the ifdef so as to not bust compiled in driver support @@ -645,6 +641,11 @@ static int asize=CONFIG_MTD_PMC551_APERT static int asize=0; #endif +module_param(msize, int, 0); +MODULE_PARM_DESC(msize, "memory size in Megabytes [1 - 1024]"); +module_param(asize, int, 0); +MODULE_PARM_DESC(asize, "aperture size, must be <= memsize [1-1024]"); + /* * PMC551 Card Initialization */ diff -puN drivers/mtd/devices/slram.c~remove-module_parm-from-allyesconfig-almost drivers/mtd/devices/slram.c --- 25/drivers/mtd/devices/slram.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.790649624 -0700 +++ 25-akpm/drivers/mtd/devices/slram.c 2004-10-25 01:37:32.122599160 -0700 @@ -66,13 +66,13 @@ typedef struct slram_mtd_list { #ifdef MODULE static char *map[SLRAM_MAX_DEVICES_PARAMS]; + +module_param_array(map, charp, NULL, 0); +MODULE_PARM_DESC(map, "List of memory regions to map. \"map=, , \""); #else static char *map; #endif -MODULE_PARM(map, "3-" __MODULE_STRING(SLRAM_MAX_DEVICES_PARAMS) "s"); -MODULE_PARM_DESC(map, "List of memory regions to map. \"map=, , \""); - static slram_mtd_list_t *slram_mtdlist = NULL; int slram_erase(struct mtd_info *, struct erase_info *); diff -puN drivers/mtd/ftl.c~remove-module_parm-from-allyesconfig-almost drivers/mtd/ftl.c --- 25/drivers/mtd/ftl.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.792649320 -0700 +++ 25-akpm/drivers/mtd/ftl.c 2004-10-25 01:37:32.123599008 -0700 @@ -80,7 +80,7 @@ /* Parameters that can be set with 'insmod' */ static int shuffle_freq = 50; -MODULE_PARM(shuffle_freq, "i"); +module_param(shuffle_freq, int, 0); /*====================================================================*/ diff -puN drivers/mtd/maps/scx200_docflash.c~remove-module_parm-from-allyesconfig-almost drivers/mtd/maps/scx200_docflash.c --- 25/drivers/mtd/maps/scx200_docflash.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.793649168 -0700 +++ 25-akpm/drivers/mtd/maps/scx200_docflash.c 2004-10-25 01:37:32.123599008 -0700 @@ -29,20 +29,20 @@ MODULE_LICENSE("GPL"); /* Set this to one if you want to partition the flash */ #define PARTITION 1 -MODULE_PARM(probe, "i"); -MODULE_PARM_DESC(probe, "Probe for a BIOS mapping"); -MODULE_PARM(size, "i"); -MODULE_PARM_DESC(size, "Size of the flash mapping"); -MODULE_PARM(width, "i"); -MODULE_PARM_DESC(width, "Data width of the flash mapping (8/16)"); -MODULE_PARM(flashtype, "s"); -MODULE_PARM_DESC(flashtype, "Type of MTD probe to do"); - static int probe = 0; /* Don't autoprobe */ static unsigned size = 0x1000000; /* 16 MiB the whole ISA address space */ static unsigned width = 8; /* Default to 8 bits wide */ static char *flashtype = "cfi_probe"; +module_param(probe, int, 0); +MODULE_PARM_DESC(probe, "Probe for a BIOS mapping"); +module_param(size, int, 0); +MODULE_PARM_DESC(size, "Size of the flash mapping"); +module_param(width, int, 0); +MODULE_PARM_DESC(width, "Data width of the flash mapping (8/16)"); +module_param(flashtype, charp, 0); +MODULE_PARM_DESC(flashtype, "Type of MTD probe to do"); + static struct resource docmem = { .flags = IORESOURCE_MEM, .name = "NatSemi SCx200 DOCCS Flash", diff -puN drivers/net/3c509.c~remove-module_parm-from-allyesconfig-almost drivers/net/3c509.c --- 25/drivers/net/3c509.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.795648864 -0700 +++ 25-akpm/drivers/net/3c509.c 2004-10-25 01:37:32.125598704 -0700 @@ -1535,16 +1535,16 @@ static int debug = -1; static int irq[] = {-1, -1, -1, -1, -1, -1, -1, -1}; static int xcvr[] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; -MODULE_PARM(debug,"i"); -MODULE_PARM(irq,"1-8i"); -MODULE_PARM(xcvr,"1-12i"); -MODULE_PARM(max_interrupt_work, "i"); +module_param(debug,int, 0); +module_param_array(irq, int, NULL, 0); +module_param_array(xcvr, int, NULL, 0); +module_param(max_interrupt_work, int, 0); MODULE_PARM_DESC(debug, "debug level (0-6)"); MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); MODULE_PARM_DESC(xcvr,"transceiver(s) (0=internal, 1=external)"); MODULE_PARM_DESC(max_interrupt_work, "maximum events handled per interrupt"); #if defined(__ISAPNP__) -MODULE_PARM(nopnp, "i"); +module_param(nopnp, int, 0); MODULE_PARM_DESC(nopnp, "disable ISA PnP support (0-1)"); MODULE_DEVICE_TABLE(isapnp, el3_isapnp_adapters); #endif /* __ISAPNP__ */ diff -puN drivers/net/3c515.c~remove-module_parm-from-allyesconfig-almost drivers/net/3c515.c --- 25/drivers/net/3c515.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.796648712 -0700 +++ 25-akpm/drivers/net/3c515.c 2004-10-25 01:37:32.126598552 -0700 @@ -87,15 +87,6 @@ MODULE_AUTHOR("Donald Becker "); MODULE_LICENSE("GPL"); -MODULE_PARM (max_baud, "i"); +module_param (max_baud, int, 0); MODULE_PARM_DESC(max_baud, "Maximum baud rate"); #ifdef USE_PROBE -MODULE_PARM (do_probe, "i"); +module_param (do_probe, bool, 0); MODULE_PARM_DESC(do_probe, "Enable/disable chip probing and self-test"); #endif diff -puN drivers/net/irda/irda-usb.c~remove-module_parm-from-allyesconfig-almost drivers/net/irda/irda-usb.c --- 25/drivers/net/irda/irda-usb.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.829643696 -0700 +++ 25-akpm/drivers/net/irda/irda-usb.c 2004-10-25 01:37:32.157593840 -0700 @@ -1593,7 +1593,7 @@ module_exit(usb_irda_cleanup); /* * Module parameters */ -MODULE_PARM(qos_mtt_bits, "i"); +module_param(qos_mtt_bits, int, 0); MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); MODULE_AUTHOR("Roman Weissgaerber , Dag Brattli and Jean Tourrilhes "); MODULE_DESCRIPTION("IrDA-USB Dongle Driver"); diff -puN drivers/net/irda/irtty-sir.c~remove-module_parm-from-allyesconfig-almost drivers/net/irda/irtty-sir.c --- 25/drivers/net/irda/irtty-sir.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.830643544 -0700 +++ 25-akpm/drivers/net/irda/irtty-sir.c 2004-10-25 01:37:32.158593688 -0700 @@ -39,11 +39,11 @@ #include "sir-dev.h" #include "irtty-sir.h" -MODULE_PARM(qos_mtt_bits, "i"); -MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); - static int qos_mtt_bits = 0x03; /* 5 ms or more */ +module_param(qos_mtt_bits, int, 0); +MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); + /* ------------------------------------------------------- */ /* device configuration callbacks always invoked with irda-thread context */ diff -puN drivers/net/irda/nsc-ircc.c~remove-module_parm-from-allyesconfig-almost drivers/net/irda/nsc-ircc.c --- 25/drivers/net/irda/nsc-ircc.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.832643240 -0700 +++ 25-akpm/drivers/net/irda/nsc-ircc.c 2004-10-25 01:37:32.160593384 -0700 @@ -2206,15 +2206,15 @@ MODULE_DESCRIPTION("NSC IrDA Device Driv MODULE_LICENSE("GPL"); -MODULE_PARM(qos_mtt_bits, "i"); +module_param(qos_mtt_bits, int, 0); MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); -MODULE_PARM(io, "1-4i"); +module_param_array(io, int, NULL, 0); MODULE_PARM_DESC(io, "Base I/O addresses"); -MODULE_PARM(irq, "1-4i"); +module_param_array(irq, int, NULL, 0); MODULE_PARM_DESC(irq, "IRQ lines"); -MODULE_PARM(dma, "1-4i"); +module_param_array(dma, int, NULL, 0); MODULE_PARM_DESC(dma, "DMA channels"); -MODULE_PARM(dongle_id, "i"); +module_param(dongle_id, int, 0); MODULE_PARM_DESC(dongle_id, "Type-id of used dongle"); module_init(nsc_ircc_init); diff -puN drivers/net/irda/tekram-sir.c~remove-module_parm-from-allyesconfig-almost drivers/net/irda/tekram-sir.c --- 25/drivers/net/irda/tekram-sir.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.833643088 -0700 +++ 25-akpm/drivers/net/irda/tekram-sir.c 2004-10-25 01:37:32.160593384 -0700 @@ -32,9 +32,9 @@ #include "sir-dev.h" -MODULE_PARM(tekram_delay, "i"); -MODULE_PARM_DESC(tekram_delay, "tekram dongle write complete delay"); static int tekram_delay = 150; /* default is 150 ms */ +module_param(tekram_delay, int, 0); +MODULE_PARM_DESC(tekram_delay, "tekram dongle write complete delay"); static int tekram_open(struct sir_dev *); static int tekram_close(struct sir_dev *); diff -puN drivers/net/irda/w83977af_ir.c~remove-module_parm-from-allyesconfig-almost drivers/net/irda/w83977af_ir.c --- 25/drivers/net/irda/w83977af_ir.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.834642936 -0700 +++ 25-akpm/drivers/net/irda/w83977af_ir.c 2004-10-25 01:37:32.161593232 -0700 @@ -1355,11 +1355,11 @@ MODULE_DESCRIPTION("Winbond W83977AF IrD MODULE_LICENSE("GPL"); -MODULE_PARM(qos_mtt_bits, "i"); +module_param(qos_mtt_bits, int, 0); MODULE_PARM_DESC(qos_mtt_bits, "Mimimum Turn Time"); -MODULE_PARM(io, "1-4i"); +module_param_array(io, int, NULL, 0); MODULE_PARM_DESC(io, "Base I/O addresses"); -MODULE_PARM(irq, "1-4i"); +module_param_array(irq, int, NULL, 0); MODULE_PARM_DESC(irq, "IRQ lines"); /* diff -puN drivers/net/ixgb/ixgb_param.c~remove-module_parm-from-allyesconfig-almost drivers/net/ixgb/ixgb_param.c --- 25/drivers/net/ixgb/ixgb_param.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.836642632 -0700 +++ 25-akpm/drivers/net/ixgb/ixgb_param.c 2004-10-25 01:37:32.162593080 -0700 @@ -56,8 +56,8 @@ */ #define IXGB_PARAM(X, S) \ -static const int __devinitdata X[IXGB_MAX_NIC + 1] = IXGB_PARAM_INIT; \ -MODULE_PARM(X, "1-" __MODULE_STRING(IXGB_MAX_NIC) "i"); \ +static int __devinitdata X[IXGB_MAX_NIC + 1] = IXGB_PARAM_INIT; \ +module_param_array(X, int, NULL, 0); \ MODULE_PARM_DESC(X, S); /* Transmit Descriptor Count diff -puN drivers/net/natsemi.c~remove-module_parm-from-allyesconfig-almost drivers/net/natsemi.c --- 25/drivers/net/natsemi.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.838642328 -0700 +++ 25-akpm/drivers/net/natsemi.c 2004-10-25 01:37:32.164592776 -0700 @@ -251,12 +251,12 @@ MODULE_AUTHOR("Donald Becker "); MODULE_DESCRIPTION("SysKonnect SK-NET Gigabit Ethernet SK-98xx driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(Speed_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(Speed_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(AutoNeg_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(AutoNeg_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(DupCap_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(DupCap_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(FlowCtrl_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(FlowCtrl_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(Role_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(Role_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(ConType, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(PrefPort, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(RlmtMode, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -/* used for interrupt moderation */ -MODULE_PARM(IntsPerSec, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "i"); -MODULE_PARM(Moderation, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(Stats, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(ModerationMask, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(AutoSizing, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); - #ifdef LINK_SPEED_A static char *Speed_A[SK_MAX_CARD_PARAM] = LINK_SPEED; @@ -465,6 +445,26 @@ static char *ModerationMask[SK_MAX_CARD_ static char *AutoSizing[SK_MAX_CARD_PARAM]; static char *Stats[SK_MAX_CARD_PARAM]; +module_param_array(Speed_A, charp, NULL, 0); +module_param_array(Speed_B, charp, NULL, 0); +module_param_array(AutoNeg_A, charp, NULL, 0); +module_param_array(AutoNeg_B, charp, NULL, 0); +module_param_array(DupCap_A, charp, NULL, 0); +module_param_array(DupCap_B, charp, NULL, 0); +module_param_array(FlowCtrl_A, charp, NULL, 0); +module_param_array(FlowCtrl_B, charp, NULL, 0); +module_param_array(Role_A, charp, NULL, 0); +module_param_array(Role_B, charp, NULL, 0); +module_param_array(ConType, charp, NULL, 0); +module_param_array(PrefPort, charp, NULL, 0); +module_param_array(RlmtMode, charp, NULL, 0); +/* used for interrupt moderation */ +module_param_array(IntsPerSec, int, NULL, 0); +module_param_array(Moderation, charp, NULL, 0); +module_param_array(Stats, charp, NULL, 0); +module_param_array(ModerationMask, charp, NULL, 0); +module_param_array(AutoSizing, charp, NULL, 0); + /***************************************************************************** * * SkGeBoardInit - do level 0 and 1 initialization diff -puN drivers/net/smc-mca.c~remove-module_parm-from-allyesconfig-almost drivers/net/smc-mca.c --- 25/drivers/net/smc-mca.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.861638832 -0700 +++ 25-akpm/drivers/net/smc-mca.c 2004-10-25 01:37:32.186589432 -0700 @@ -95,8 +95,8 @@ static int ultra_io[MAX_ULTRAMCA_CARDS]; static int ultra_irq[MAX_ULTRAMCA_CARDS]; MODULE_LICENSE("GPL"); -MODULE_PARM(ultra_io, "1-" __MODULE_STRING(MAX_ULTRAMCA_CARDS) "i"); -MODULE_PARM(ultra_irq, "1-" __MODULE_STRING(MAX_ULTRAMCA_CARDS) "i"); +module_param_array(ultra_io, int, NULL, 0); +module_param_array(ultra_irq, int, NULL, 0); MODULE_PARM_DESC(ultra_io, "SMC Ultra/EtherEZ MCA I/O base address(es)"); MODULE_PARM_DESC(ultra_irq, "SMC Ultra/EtherEZ MCA IRQ number(s)"); diff -puN drivers/net/starfire.c~remove-module_parm-from-allyesconfig-almost drivers/net/starfire.c --- 25/drivers/net/starfire.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.863638528 -0700 +++ 25-akpm/drivers/net/starfire.c 2004-10-25 01:37:32.188589128 -0700 @@ -372,15 +372,15 @@ MODULE_AUTHOR("Donald Becker "); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)"); -MODULE_PARM(rx_copybreak, "i"); +module_param(rx_copybreak, int, 0); #if defined(NETIF_F_TSO) && MAX_SKB_FRAGS > 32 #warning Typhoon only supports 32 entries in its SG list for TSO, disabling TSO diff -puN drivers/net/via-velocity.c~remove-module_parm-from-allyesconfig-almost drivers/net/via-velocity.c --- 25/drivers/net/via-velocity.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.881635792 -0700 +++ 25-akpm/drivers/net/via-velocity.c 2004-10-25 01:37:32.210585784 -0700 @@ -100,8 +100,8 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("VIA Networking Velocity Family Gigabit Ethernet Adapter Driver"); #define VELOCITY_PARAM(N,D) \ - static const int N[MAX_UNITS]=OPTION_DEFAULT;\ - MODULE_PARM(N, "1-" __MODULE_STRING(MAX_UNITS) "i");\ + static int N[MAX_UNITS]=OPTION_DEFAULT;\ + module_param_array(N, int, NULL, 0);\ MODULE_PARM_DESC(N, D); #define RX_DESC_MIN 64 @@ -229,7 +229,7 @@ VELOCITY_PARAM(wol_opts, "Wake On Lan op VELOCITY_PARAM(int_works, "Number of packets per interrupt services"); static int rx_copybreak = 200; -MODULE_PARM(rx_copybreak, "i"); +module_param(rx_copybreak, int, 0); MODULE_PARM_DESC(rx_copybreak, "Copy breakpoint for copy-only-tiny-frames"); static void velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr, struct velocity_info_tbl *info); diff -puN drivers/net/wan/cosa.c~remove-module_parm-from-allyesconfig-almost drivers/net/wan/cosa.c --- 25/drivers/net/wan/cosa.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.883635488 -0700 +++ 25-akpm/drivers/net/wan/cosa.c 2004-10-25 01:49:31.884178768 -0700 @@ -238,11 +238,11 @@ static int irq[MAX_CARDS+1] = { -1, -1, static struct class_simple *cosa_class; #ifdef MODULE -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_CARDS) "i"); +module_param_array(io, int, NULL, 0); MODULE_PARM_DESC(io, "The I/O bases of the COSA or SRP cards"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_CARDS) "i"); +module_param_array(irq, int, NULL, 0); MODULE_PARM_DESC(irq, "The IRQ lines of the COSA or SRP cards"); -MODULE_PARM(dma, "1-" __MODULE_STRING(MAX_CARDS) "i"); +module_param_array(dma, int, NULL, 0); MODULE_PARM_DESC(dma, "The DMA channels of the COSA or SRP cards"); MODULE_AUTHOR("Jan \"Yenya\" Kasprzak, "); diff -puN drivers/net/wan/dscc4.c~remove-module_parm-from-allyesconfig-almost drivers/net/wan/dscc4.c --- 25/drivers/net/wan/dscc4.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.884635336 -0700 +++ 25-akpm/drivers/net/wan/dscc4.c 2004-10-25 01:37:32.213585328 -0700 @@ -125,9 +125,9 @@ static u32 dscc4_pci_config_store[16]; MODULE_AUTHOR("Maintainer: Francois Romieu "); MODULE_DESCRIPTION("Siemens PEB20534 PCI Controler"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug,"i"); +module_param(debug, int, 0); MODULE_PARM_DESC(debug,"Enable/disable extra messages"); -MODULE_PARM(quartz,"i"); +module_param(quartz, int, 0); MODULE_PARM_DESC(quartz,"If present, on-board quartz frequency (Hz)"); /* Structures */ diff -puN drivers/net/wan/farsync.c~remove-module_parm-from-allyesconfig-almost drivers/net/wan/farsync.c --- 25/drivers/net/wan/farsync.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.886635032 -0700 +++ 25-akpm/drivers/net/wan/farsync.c 2004-10-25 01:37:32.215585024 -0700 @@ -33,11 +33,6 @@ */ MODULE_AUTHOR("R.J.Dunlop "); MODULE_DESCRIPTION("FarSync T-Series WAN driver. FarSite Communications Ltd."); -MODULE_PARM(fst_txq_low, "i"); -MODULE_PARM(fst_txq_high, "i"); -MODULE_PARM(fst_max_reads, "i"); -MODULE_PARM(fst_excluded_cards, "i"); -MODULE_PARM(fst_excluded_list, "0-32i"); MODULE_LICENSE("GPL"); /* Driver configuration and global parameters @@ -85,6 +80,12 @@ int fst_max_reads = 7; int fst_excluded_cards = 0; int fst_excluded_list[FST_MAX_CARDS]; +module_param(fst_txq_low, int, 0); +module_param(fst_txq_high, int, 0); +module_param(fst_max_reads, int, 0); +module_param(fst_excluded_cards, int, 0); +module_param_array(fst_excluded_list, int, NULL, 0); + /* Card shared memory layout * ========================= */ diff -puN drivers/net/wan/hostess_sv11.c~remove-module_parm-from-allyesconfig-almost drivers/net/wan/hostess_sv11.c --- 25/drivers/net/wan/hostess_sv11.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.887634880 -0700 +++ 25-akpm/drivers/net/wan/hostess_sv11.c 2004-10-25 01:37:32.216584872 -0700 @@ -388,11 +388,11 @@ static void sv11_shutdown(struct sv11_de static int io=0x200; static int irq=9; -MODULE_PARM(io,"i"); +module_param(io, int, 0); MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card"); -MODULE_PARM(dma,"i"); +module_param(dma, int, 0); MODULE_PARM_DESC(dma, "Set this to 1 to use DMA1/DMA3 for TX/RX"); -MODULE_PARM(irq,"i"); +module_param(irq, int, 0); MODULE_PARM_DESC(irq, "The interrupt line setting for the Comtrol Hostess SV11 card"); MODULE_AUTHOR("Alan Cox"); diff -puN drivers/net/wan/sealevel.c~remove-module_parm-from-allyesconfig-almost drivers/net/wan/sealevel.c --- 25/drivers/net/wan/sealevel.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.889634576 -0700 +++ 25-akpm/drivers/net/wan/sealevel.c 2004-10-25 01:37:32.217584720 -0700 @@ -431,15 +431,15 @@ static int rxdma=3; static int irq=5; static int slow=0; -MODULE_PARM(io,"i"); +module_param(io, int, 0); MODULE_PARM_DESC(io, "The I/O base of the Sealevel card"); -MODULE_PARM(txdma,"i"); +module_param(txdma, int, 0); MODULE_PARM_DESC(txdma, "Transmit DMA channel"); -MODULE_PARM(rxdma,"i"); +module_param(rxdma, int, 0); MODULE_PARM_DESC(rxdma, "Receive DMA channel"); -MODULE_PARM(irq,"i"); +module_param(irq, int, 0); MODULE_PARM_DESC(irq, "The interrupt line setting for the SeaLevel card"); -MODULE_PARM(slow,"i"); +module_param(slow, bool, 0); MODULE_PARM_DESC(slow, "Set this for an older Sealevel card such as the 4012"); MODULE_AUTHOR("Alan Cox"); diff -puN drivers/net/wan/syncppp.c~remove-module_parm-from-allyesconfig-almost drivers/net/wan/syncppp.c --- 25/drivers/net/wan/syncppp.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.890634424 -0700 +++ 25-akpm/drivers/net/wan/syncppp.c 2004-10-25 01:37:32.218584568 -0700 @@ -1483,6 +1483,6 @@ static void __exit sync_ppp_cleanup(void module_init(sync_ppp_init); module_exit(sync_ppp_cleanup); -MODULE_PARM(debug,"1i"); +module_param(debug, int, 0); MODULE_LICENSE("GPL"); diff -puN drivers/net/wireless/airo.c~remove-module_parm-from-allyesconfig-almost drivers/net/wireless/airo.c --- 25/drivers/net/wireless/airo.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.893633968 -0700 +++ 25-akpm/drivers/net/wireless/airo.c 2004-10-25 01:37:32.223583808 -0700 @@ -246,36 +246,36 @@ MODULE_DESCRIPTION("Support for Cisco/Ai for PCMCIA when used with airo_cs."); MODULE_LICENSE("Dual BSD/GPL"); MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); -MODULE_PARM(io,"1-4i"); -MODULE_PARM(irq,"1-4i"); -MODULE_PARM(basic_rate,"i"); -MODULE_PARM(rates,"1-8i"); -MODULE_PARM(ssids,"1-3s"); -MODULE_PARM(auto_wep,"i"); +module_param_array(io, int, NULL, 0); +module_param_array(irq, int, NULL, 0); +module_param(basic_rate, int, 0); +module_param_array(rates, int, NULL, 0); +module_param_array(ssids, charp, NULL, 0); +module_param(auto_wep, int, 0); MODULE_PARM_DESC(auto_wep, "If non-zero, the driver will keep looping through \ the authentication options until an association is made. The value of \ auto_wep is number of the wep keys to check. A value of 2 will try using \ the key at index 0 and index 1."); -MODULE_PARM(aux_bap,"i"); +module_param(aux_bap, int, 0); MODULE_PARM_DESC(aux_bap, "If non-zero, the driver will switch into a mode \ than seems to work better for older cards with some older buses. Before \ switching it checks that the switch is needed."); -MODULE_PARM(maxencrypt, "i"); +module_param(maxencrypt, int, 0); MODULE_PARM_DESC(maxencrypt, "The maximum speed that the card can do \ encryption. Units are in 512kbs. Zero (default) means there is no limit. \ Older cards used to be limited to 2mbs (4)."); -MODULE_PARM(adhoc, "i"); +module_param(adhoc, int, 0); MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode."); -MODULE_PARM(probe, "i"); +module_param(probe, int, 0); MODULE_PARM_DESC(probe, "If zero, the driver won't start the card."); -MODULE_PARM(proc_uid, "i"); +module_param(proc_uid, int, 0); MODULE_PARM_DESC(proc_uid, "The uid that the /proc files will belong to."); -MODULE_PARM(proc_gid, "i"); +module_param(proc_gid, int, 0); MODULE_PARM_DESC(proc_gid, "The gid that the /proc files will belong to."); -MODULE_PARM(airo_perm, "i"); +module_param(airo_perm, int, 0); MODULE_PARM_DESC(airo_perm, "The permission bits of /proc/[driver/]aironet."); -MODULE_PARM(proc_perm, "i"); +module_param(proc_perm, int, 0); MODULE_PARM_DESC(proc_perm, "The permission bits of the files in /proc"); /* This is a kind of sloppy hack to get this information to OUT4500 and diff -puN drivers/net/wireless/airo_cs.c~remove-module_parm-from-allyesconfig-almost drivers/net/wireless/airo_cs.c --- 25/drivers/net/wireless/airo_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.894633816 -0700 +++ 25-akpm/drivers/net/wireless/airo_cs.c 2004-10-25 01:37:32.224583656 -0700 @@ -75,8 +75,8 @@ MODULE_DESCRIPTION("Support for Cisco/Ai with the airo module."); MODULE_LICENSE("Dual BSD/GPL"); MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards"); -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); /*====================================================================*/ diff -puN drivers/net/wireless/arlan-main.c~remove-module_parm-from-allyesconfig-almost drivers/net/wireless/arlan-main.c --- 25/drivers/net/wireless/arlan-main.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.896633512 -0700 +++ 25-akpm/drivers/net/wireless/arlan-main.c 2004-10-25 01:37:32.226583352 -0700 @@ -39,35 +39,32 @@ static int testMemory = testMemoryUNKNOW static int irq = irqUNKNOWN; static int txScrambled = 1; static int mdebug; -#endif -MODULE_PARM(irq, "i"); -MODULE_PARM(mem, "i"); -MODULE_PARM(arlan_debug, "i"); -MODULE_PARM(testMemory, "i"); -MODULE_PARM(spreadingCode, "i"); -MODULE_PARM(channelNumber, "i"); -MODULE_PARM(channelSet, "i"); -MODULE_PARM(systemId, "i"); -MODULE_PARM(registrationMode, "i"); -MODULE_PARM(radioNodeId, "i"); -MODULE_PARM(SID, "i"); -MODULE_PARM(txScrambled, "i"); -MODULE_PARM(keyStart, "i"); -MODULE_PARM(mdebug, "i"); -MODULE_PARM(tx_delay_ms, "i"); -MODULE_PARM(retries, "i"); -MODULE_PARM(async, "i"); -MODULE_PARM(tx_queue_len, "i"); -MODULE_PARM(arlan_entry_debug, "i"); -MODULE_PARM(arlan_exit_debug, "i"); -MODULE_PARM(arlan_entry_and_exit_debug, "i"); -MODULE_PARM(arlan_EEPROM_bad, "i"); +module_param(irq, int, 0); +module_param(mdebug, int, 0); +module_param(testMemory, int, 0); +module_param(arlan_entry_debug, int, 0); +module_param(arlan_exit_debug, int, 0); +module_param(txScrambled, int, 0); MODULE_PARM_DESC(irq, "(unused)"); -MODULE_PARM_DESC(mem, "Arlan memory address for single device probing"); -MODULE_PARM_DESC(arlan_debug, "Arlan debug enable (0-1)"); MODULE_PARM_DESC(testMemory, "(unused)"); MODULE_PARM_DESC(mdebug, "Arlan multicast debugging (0-1)"); +#endif + +module_param(arlan_debug, int, 0); +module_param(spreadingCode, int, 0); +module_param(channelNumber, int, 0); +module_param(channelSet, int, 0); +module_param(systemId, int, 0); +module_param(registrationMode, int, 0); +module_param(radioNodeId, int, 0); +module_param(SID, int, 0); +module_param(keyStart, int, 0); +module_param(tx_delay_ms, int, 0); +module_param(retries, int, 0); +module_param(tx_queue_len, int, 0); +module_param(arlan_EEPROM_bad, int, 0); +MODULE_PARM_DESC(arlan_debug, "Arlan debug enable (0-1)"); MODULE_PARM_DESC(retries, "Arlan maximum packet retransmisions"); #ifdef ARLAN_ENTRY_EXIT_DEBUGGING MODULE_PARM_DESC(arlan_entry_debug, "Arlan driver function entry debugging"); diff -puN drivers/net/wireless/netwave_cs.c~remove-module_parm-from-allyesconfig-almost drivers/net/wireless/netwave_cs.c --- 25/drivers/net/wireless/netwave_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.897633360 -0700 +++ 25-akpm/drivers/net/wireless/netwave_cs.c 2004-10-25 01:37:32.228583048 -0700 @@ -195,11 +195,11 @@ static int mem_speed; static u_int irq_mask = 0xdeb8; static int irq_list[4] = { -1 }; -MODULE_PARM(domain, "i"); -MODULE_PARM(scramble_key, "i"); -MODULE_PARM(mem_speed, "i"); -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +module_param(domain, int, 0); +module_param(scramble_key, int, 0); +module_param(mem_speed, int, 0); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); /*====================================================================*/ diff -puN drivers/net/wireless/orinoco.c~remove-module_parm-from-allyesconfig-almost drivers/net/wireless/orinoco.c --- 25/drivers/net/wireless/orinoco.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.899633056 -0700 +++ 25-akpm/drivers/net/wireless/orinoco.c 2004-10-25 01:37:32.231582592 -0700 @@ -461,12 +461,12 @@ MODULE_LICENSE("Dual MPL/GPL"); /* Level of debugging. Used in the macros in orinoco.h */ #ifdef ORINOCO_DEBUG int orinoco_debug = ORINOCO_DEBUG; -MODULE_PARM(orinoco_debug, "i"); +module_param(orinoco_debug, int, 0); EXPORT_SYMBOL(orinoco_debug); #endif static int suppress_linkstatus; /* = 0 */ -MODULE_PARM(suppress_linkstatus, "i"); +module_param(suppress_linkstatus, bool, 0); /********************************************************************/ /* Compile time configuration and compatibility stuff */ diff -puN drivers/net/wireless/orinoco_cs.c~remove-module_parm-from-allyesconfig-almost drivers/net/wireless/orinoco_cs.c --- 25/drivers/net/wireless/orinoco_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.901632752 -0700 +++ 25-akpm/drivers/net/wireless/orinoco_cs.c 2004-10-25 01:37:32.232582440 -0700 @@ -64,9 +64,9 @@ static int irq_list[4] = { -1 }; * don't have any CIS entry for it. This workaround it... */ static int ignore_cis_vcc; /* = 0 */ -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); -MODULE_PARM(ignore_cis_vcc, "i"); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); +module_param(ignore_cis_vcc, int, 0); /********************************************************************/ /* Magic constants */ diff -puN drivers/net/wireless/ray_cs.c~remove-module_parm-from-allyesconfig-almost drivers/net/wireless/ray_cs.c --- 25/drivers/net/wireless/ray_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.902632600 -0700 +++ 25-akpm/drivers/net/wireless/ray_cs.c 2004-10-25 01:37:32.234582136 -0700 @@ -222,18 +222,18 @@ MODULE_AUTHOR("Corey Thomas "); MODULE_DESCRIPTION("Generic ISA Plug & Play support"); -MODULE_PARM(isapnp_disable, "i"); +module_param(isapnp_disable, int, 0); MODULE_PARM_DESC(isapnp_disable, "ISA Plug & Play disable"); -MODULE_PARM(isapnp_rdp, "i"); +module_param(isapnp_rdp, int, 0); MODULE_PARM_DESC(isapnp_rdp, "ISA Plug & Play read data port"); -MODULE_PARM(isapnp_reset, "i"); +module_param(isapnp_reset, int, 0); MODULE_PARM_DESC(isapnp_reset, "ISA Plug & Play reset all cards"); -MODULE_PARM(isapnp_verbose, "i"); +module_param(isapnp_verbose, int, 0); MODULE_PARM_DESC(isapnp_verbose, "ISA Plug & Play verbose mode"); MODULE_LICENSE("GPL"); diff -puN drivers/scsi/aacraid/aachba.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/aacraid/aachba.c --- 25/drivers/scsi/aacraid/aachba.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.908631688 -0700 +++ 25-akpm/drivers/scsi/aacraid/aachba.c 2004-10-25 01:37:32.238581528 -0700 @@ -146,18 +146,18 @@ static char *aac_get_status_string(u32 s * Non dasd selection is handled entirely in aachba now */ -MODULE_PARM(nondasd, "i"); -MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices. 0=off, 1=on"); -MODULE_PARM(dacmode, "i"); -MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC. 0=off, 1=on"); -MODULE_PARM(commit, "i"); -MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the adapter for foreign arrays.\nThis is typically needed in systems that do not have a BIOS. 0=off, 1=on"); - static int nondasd = -1; static int dacmode = -1; static int commit = -1; +module_param(nondasd, int, 0); +MODULE_PARM_DESC(nondasd, "Control scanning of hba for nondasd devices. 0=off, 1=on"); +module_param(dacmode, int, 0); +MODULE_PARM_DESC(dacmode, "Control whether dma addressing is using 64 bit DAC. 0=off, 1=on"); +module_param(commit, int, 0); +MODULE_PARM_DESC(commit, "Control whether a COMMIT_CONFIG is issued to the adapter for foreign arrays.\nThis is typically needed in systems that do not have a BIOS. 0=off, 1=on"); + /** * aac_get_config_status - check the adapter configuration * @common: adapter to query diff -puN drivers/scsi/aic7xxx/aic79xx_osm.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/aic7xxx/aic79xx_osm.c --- 25/drivers/scsi/aic7xxx/aic79xx_osm.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.910631384 -0700 +++ 25-akpm/drivers/scsi/aic7xxx/aic79xx_osm.c 2004-10-25 01:37:32.242580920 -0700 @@ -418,7 +418,7 @@ MODULE_AUTHOR("Maintainer: Justin T. Gib MODULE_DESCRIPTION("Adaptec Aic790X U320 SCSI Host Bus Adapter driver"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_VERSION(AIC79XX_DRIVER_VERSION); -MODULE_PARM(aic79xx, "s"); +module_param(aic79xx, charp, 0); MODULE_PARM_DESC(aic79xx, "period delimited, options string.\n" " verbose Enable verbose/diagnostic logging\n" diff -puN drivers/scsi/fdomain.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/fdomain.c --- 25/drivers/scsi/fdomain.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.912631080 -0700 +++ 25-akpm/drivers/scsi/fdomain.c 2004-10-25 01:37:32.244580616 -0700 @@ -408,7 +408,7 @@ static irqreturn_t do_fdomain_16x0 /* Allow insmod parameters to be like LILO parameters. For example: insmod fdomain fdomain=0x140,11 */ static char * fdomain = NULL; -MODULE_PARM(fdomain, "s"); +module_param(fdomain, charp, 0); static unsigned long addresses[] = { 0xc8000, diff -puN drivers/scsi/g_NCR5380.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/g_NCR5380.c --- 25/drivers/scsi/g_NCR5380.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.913630928 -0700 +++ 25-akpm/drivers/scsi/g_NCR5380.c 2004-10-25 01:37:32.245580464 -0700 @@ -920,13 +920,13 @@ static Scsi_Host_Template driver_templat #include #include "scsi_module.c" -MODULE_PARM(ncr_irq, "i"); -MODULE_PARM(ncr_dma, "i"); -MODULE_PARM(ncr_addr, "i"); -MODULE_PARM(ncr_5380, "i"); -MODULE_PARM(ncr_53c400, "i"); -MODULE_PARM(ncr_53c400a, "i"); -MODULE_PARM(dtc_3181e, "i"); +module_param(ncr_irq, int, 0); +module_param(ncr_dma, int, 0); +module_param(ncr_addr, int, 0); +module_param(ncr_5380, int, 0); +module_param(ncr_53c400, int, 0); +module_param(ncr_53c400a, int, 0); +module_param(dtc_3181e, int, 0); MODULE_LICENSE("GPL"); diff -puN drivers/scsi/in2000.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/in2000.c --- 25/drivers/scsi/in2000.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.915630624 -0700 +++ 25-akpm/drivers/scsi/in2000.c 2004-10-25 01:37:32.247580160 -0700 @@ -186,7 +186,7 @@ static char *setup_args[] = { "", "", "" /* filled in by 'insmod' */ static char *setup_strings; -MODULE_PARM(setup_strings, "s"); +module_param(setup_strings, charp, 0); static inline uchar read_3393(struct IN2000_hostdata *hostdata, uchar reg_num) { diff -puN drivers/scsi/NCR_D700.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/NCR_D700.c --- 25/drivers/scsi/NCR_D700.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.916630472 -0700 +++ 25-akpm/drivers/scsi/NCR_D700.c 2004-10-25 01:37:32.247580160 -0700 @@ -111,7 +111,7 @@ char *NCR_D700; /* command line from i MODULE_AUTHOR("James Bottomley"); MODULE_DESCRIPTION("NCR Dual700 SCSI Driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(NCR_D700, "s"); +module_param(NCR_D700, charp, 0); static __u8 __initdata id_array[2*(MCA_MAX_SLOT_NR + 1)] = { [0 ... 2*(MCA_MAX_SLOT_NR + 1)-1] = 7 }; diff -puN drivers/scsi/nsp32.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/nsp32.c --- 25/drivers/scsi/nsp32.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.918630168 -0700 +++ 25-akpm/drivers/scsi/nsp32.c 2004-10-25 01:37:32.250579704 -0700 @@ -60,17 +60,17 @@ * Module parameters */ static int trans_mode = 0; /* default: BIOS */ -MODULE_PARM (trans_mode, "i"); +module_param (trans_mode, int, 0); MODULE_PARM_DESC(trans_mode, "transfer mode (0: BIOS(default) 1: Async 2: Ultra20M"); #define ASYNC_MODE 1 #define ULTRA20M_MODE 2 static int auto_param = 0; /* default: ON */ -MODULE_PARM (auto_param, "i"); +module_param (auto_param, bool, 0); MODULE_PARM_DESC(auto_param, "AutoParameter mode (0: ON(default) 1: OFF)"); static int disc_priv = 1; /* default: OFF */ -MODULE_PARM (disc_priv, "i"); +module_param (disc_priv, bool, 0); MODULE_PARM_DESC(disc_priv, "disconnection privilege mode (0: ON 1: OFF(default))"); MODULE_AUTHOR("YOKOTA Hiroshi , GOTO Masanori "); diff -puN drivers/scsi/pcmcia/aha152x_stub.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/pcmcia/aha152x_stub.c --- 25/drivers/scsi/pcmcia/aha152x_stub.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.919630016 -0700 +++ 25-akpm/drivers/scsi/pcmcia/aha152x_stub.c 2004-10-25 01:37:32.250579704 -0700 @@ -82,14 +82,14 @@ static int synchronous = 1; static int reset_delay = 100; static int ext_trans = 0; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); -MODULE_PARM(host_id, "i"); -MODULE_PARM(reconnect, "i"); -MODULE_PARM(parity, "i"); -MODULE_PARM(synchronous, "i"); -MODULE_PARM(reset_delay, "i"); -MODULE_PARM(ext_trans, "i"); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); +module_param(host_id, int, 0); +module_param(reconnect, int, 0); +module_param(parity, int, 0); +module_param(synchronous, int, 0); +module_param(reset_delay, int, 0); +module_param(ext_trans, int, 0); MODULE_LICENSE("Dual MPL/GPL"); diff -puN drivers/scsi/pcmcia/fdomain_stub.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/pcmcia/fdomain_stub.c --- 25/drivers/scsi/pcmcia/fdomain_stub.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.921629712 -0700 +++ 25-akpm/drivers/scsi/pcmcia/fdomain_stub.c 2004-10-25 01:37:32.251579552 -0700 @@ -63,13 +63,13 @@ MODULE_LICENSE("Dual MPL/GPL"); /* Bit map of interrupts to choose from */ static int irq_mask = 0xdeb8; -MODULE_PARM(irq_mask, "i"); +module_param(irq_mask, int, 0); static int irq_list[4] = { -1 }; -MODULE_PARM(irq_list, "1-4i"); +module_param_array(irq_list, int, NULL, 0); #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +module_param(pc_debug, int, 0); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = "fdomain_cs.c 1.47 2001/10/13 00:08:52 (David Hinds)"; diff -puN drivers/scsi/pcmcia/nsp_cs.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/pcmcia/nsp_cs.c --- 25/drivers/scsi/pcmcia/nsp_cs.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.922629560 -0700 +++ 25-akpm/drivers/scsi/pcmcia/nsp_cs.c 2004-10-25 01:37:32.253579248 -0700 @@ -73,20 +73,20 @@ MODULE_LICENSE("GPL"); /* Parameters that can be set with 'insmod' */ static unsigned int irq_mask = 0xffff; -MODULE_PARM (irq_mask, "i"); +module_param(irq_mask, int, 0); MODULE_PARM_DESC(irq_mask, "IRQ mask bits (default: 0xffff)"); static int irq_list[4] = { -1 }; -MODULE_PARM (irq_list, "1-4i"); +module_param_array(irq_list, int, NULL, 0); MODULE_PARM_DESC(irq_list, "Use specified IRQ number. (default: auto select)"); static int nsp_burst_mode = BURST_MEM32; -MODULE_PARM (nsp_burst_mode, "i"); +module_param(nsp_burst_mode, int, 0); MODULE_PARM_DESC(nsp_burst_mode, "Burst transfer mode (0=io8, 1=io32, 2=mem32(default))"); /* Release IO ports after configuration? */ static int free_ports = 0; -MODULE_PARM (free_ports, "i"); +module_param(free_ports, bool, 0); MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))"); /* /usr/src/linux/drivers/scsi/hosts.h */ diff -puN drivers/scsi/pcmcia/qlogic_stub.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/pcmcia/qlogic_stub.c --- 25/drivers/scsi/pcmcia/qlogic_stub.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.924629256 -0700 +++ 25-akpm/drivers/scsi/pcmcia/qlogic_stub.c 2004-10-25 01:37:32.253579248 -0700 @@ -99,8 +99,8 @@ static Scsi_Host_Template qlogicfas_driv static unsigned int irq_mask = 0xdeb8; static int irq_list[4] = { -1 }; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +module_param(irq_mask, int, 0); +module_param_array(irq_list, int, NULL, 0); /*====================================================================*/ diff -puN drivers/scsi/qlogicfas.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/qlogicfas.c --- 25/drivers/scsi/qlogicfas.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.925629104 -0700 +++ 25-akpm/drivers/scsi/qlogicfas.c 2004-10-25 01:37:32.254579096 -0700 @@ -137,8 +137,8 @@ err: static struct qlogicfas408_priv *cards; static int iobase[MAX_QLOGICFAS]; static int irq[MAX_QLOGICFAS] = { [0 ... MAX_QLOGICFAS-1] = -1 }; -MODULE_PARM(iobase, "1-" __MODULE_STRING(MAX_QLOGICFAS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_QLOGICFAS) "i"); +module_param_array(iobase, int, NULL, 0); +module_param_array(irq, int, NULL, 0); MODULE_PARM_DESC(iobase, "I/O address"); MODULE_PARM_DESC(irq, "IRQ"); diff -puN drivers/scsi/sim710.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/sim710.c --- 25/drivers/scsi/sim710.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.926628952 -0700 +++ 25-akpm/drivers/scsi/sim710.c 2004-10-25 01:37:32.254579096 -0700 @@ -53,7 +53,7 @@ MODULE_AUTHOR("Richard Hirst"); MODULE_DESCRIPTION("Simple NCR53C710 driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(sim710, "s"); +module_param(sim710, charp, 0); #ifdef MODULE #define ARG_SEP ' ' diff -puN drivers/scsi/sr.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/sr.c --- 25/drivers/scsi/sr.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.928628648 -0700 +++ 25-akpm/drivers/scsi/sr.c 2004-10-25 01:37:32.255578944 -0700 @@ -59,9 +59,6 @@ #include "sr.h" -MODULE_PARM(xa_test, "i"); /* see sr_ioctl.c */ - - #define SR_DISKS 256 #define MAX_RETRIES 3 diff -puN drivers/scsi/sr_ioctl.c~remove-module_parm-from-allyesconfig-almost drivers/scsi/sr_ioctl.c --- 25/drivers/scsi/sr_ioctl.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.929628496 -0700 +++ 25-akpm/drivers/scsi/sr_ioctl.c 2004-10-25 01:37:32.256578792 -0700 @@ -28,6 +28,7 @@ /* The sr_is_xa() seems to trigger firmware bugs with some drives :-( * It is off by default and can be turned on with this module parameter */ static int xa_test = 0; +module_param(xa_test, bool, 0); #define IOCTL_RETRIES 3 diff -puN drivers/telephony/ixj.c~remove-module_parm-from-allyesconfig-almost drivers/telephony/ixj.c --- 25/drivers/telephony/ixj.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.932628040 -0700 +++ 25-akpm/drivers/telephony/ixj.c 2004-10-25 01:37:32.264577576 -0700 @@ -285,7 +285,7 @@ static int ixjdebug; static int hertz = HZ; static int samplerate = 100; -MODULE_PARM(ixjdebug, "i"); +module_param(ixjdebug, int, 0); /************************************************************************ * @@ -7707,8 +7707,8 @@ static int xio[IXJMAX + 1] = 0, }; -MODULE_PARM(dspio, "1-" __MODULE_STRING(IXJMAX) "i"); -MODULE_PARM(xio, "1-" __MODULE_STRING(IXJMAX) "i"); +module_param_array(dspio, int, NULL, 0); +module_param_array(xio, int, NULL, 0); MODULE_DESCRIPTION("Quicknet VoIP Telephony card module - www.quicknet.net"); MODULE_AUTHOR("Ed Okerson "); MODULE_LICENSE("GPL"); diff -puN drivers/video/cyber2000fb.c~remove-module_parm-from-allyesconfig-almost drivers/video/cyber2000fb.c --- 25/drivers/video/cyber2000fb.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.934627736 -0700 +++ 25-akpm/drivers/video/cyber2000fb.c 2004-10-25 01:37:32.265577424 -0700 @@ -94,7 +94,7 @@ struct cfb_info { static char default_font_storage[40]; static char *default_font = "Acorn8x8"; -MODULE_PARM(default_font, "s"); +module_param(default_font, charp, 0); MODULE_PARM_DESC(default_font, "Default font name"); /* diff -puN drivers/video/hgafb.c~remove-module_parm-from-allyesconfig-almost drivers/video/hgafb.c --- 25/drivers/video/hgafb.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.935627584 -0700 +++ 25-akpm/drivers/video/hgafb.c 2004-10-25 01:37:32.266577272 -0700 @@ -610,7 +610,7 @@ MODULE_AUTHOR("Ferenc Bakonyi (fero@dram MODULE_DESCRIPTION("FBDev driver for Hercules Graphics Adaptor"); MODULE_LICENSE("GPL"); -MODULE_PARM(nologo, "i"); +module_param(nologo, bool, 0); MODULE_PARM_DESC(nologo, "Disables startup logo if != 0 (default=0)"); module_init(hgafb_init); diff -puN drivers/video/matrox/matroxfb_crtc2.c~remove-module_parm-from-allyesconfig-almost drivers/video/matrox/matroxfb_crtc2.c --- 25/drivers/video/matrox/matroxfb_crtc2.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.937627280 -0700 +++ 25-akpm/drivers/video/matrox/matroxfb_crtc2.c 2004-10-25 01:37:32.267577120 -0700 @@ -21,7 +21,7 @@ static int mem = 8192; -MODULE_PARM(mem, "i"); +module_param(mem, int, 0); MODULE_PARM_DESC(mem, "Memory size reserved for dualhead (default=8MB)"); /* **************************************************** */ diff -puN drivers/video/pm2fb.c~remove-module_parm-from-allyesconfig-almost drivers/video/pm2fb.c --- 25/drivers/video/pm2fb.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.938627128 -0700 +++ 25-akpm/drivers/video/pm2fb.c 2004-10-25 01:37:32.268576968 -0700 @@ -1278,9 +1278,9 @@ int __init pm2fb_setup(char *options) module_init(pm2fb_init); module_exit(pm2fb_exit); -MODULE_PARM(mode,"s"); -MODULE_PARM(lowhsync,"i"); -MODULE_PARM(lowvsync,"i"); +module_param(mode, charp, 0); +module_param(lowhsync, int, 0); +module_param(lowvsync, int, 0); MODULE_AUTHOR("Jim Hague "); MODULE_DESCRIPTION("Permedia2 framebuffer device driver"); diff -puN drivers/video/sstfb.c~remove-module_parm-from-allyesconfig-almost drivers/video/sstfb.c --- 25/drivers/video/sstfb.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.940626824 -0700 +++ 25-akpm/drivers/video/sstfb.c 2004-10-25 01:37:32.269576816 -0700 @@ -1711,14 +1711,14 @@ MODULE_AUTHOR("(c) 2000,2002 Ghozlane To MODULE_DESCRIPTION("FBDev driver for 3dfx Voodoo Graphics and Voodoo2 based video boards"); MODULE_LICENSE("GPL"); -MODULE_PARM(mem, "i"); +module_param(mem, int, 0); MODULE_PARM_DESC(mem, "Size of frame buffer memory in MB (1, 2, 4 MB, default=autodetect)"); -MODULE_PARM(vgapass, "i"); +module_param(vgapass, bool, 0); MODULE_PARM_DESC(vgapass, "Enable VGA PassThrough mode (0 or 1) (default=0)"); -MODULE_PARM(clipping , "i"); +module_param(clipping, bool, 0); MODULE_PARM_DESC(clipping, "Enable clipping (slower, safer) (0 or 1) (default=1)"); -MODULE_PARM(gfxclk , "i"); +module_param(gfxclk, int, 0); MODULE_PARM_DESC(gfxclk, "Force graphic chip frequency in MHz. DANGEROUS. (default=auto)"); -MODULE_PARM(slowpci, "i"); +module_param(slowpci, bool, 0); MODULE_PARM_DESC(slowpci, "Uses slow PCI settings (0 or 1) (default=0)"); diff -puN drivers/video/tridentfb.c~remove-module_parm-from-allyesconfig-almost drivers/video/tridentfb.c --- 25/drivers/video/tridentfb.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.941626672 -0700 +++ 25-akpm/drivers/video/tridentfb.c 2004-10-25 01:37:32.270576664 -0700 @@ -76,16 +76,16 @@ static int memdiff; static int nativex; -MODULE_PARM(mode,"s"); -MODULE_PARM(bpp,"i"); -MODULE_PARM(center,"i"); -MODULE_PARM(stretch,"i"); -MODULE_PARM(noaccel,"i"); -MODULE_PARM(memsize,"i"); -MODULE_PARM(memdiff,"i"); -MODULE_PARM(nativex,"i"); -MODULE_PARM(fp,"i"); -MODULE_PARM(crt,"i"); +module_param(mode, charp, 0); +module_param(bpp, int, 0); +module_param(center, int, 0); +module_param(stretch, int, 0); +module_param(noaccel, int, 0); +module_param(memsize, int, 0); +module_param(memdiff, int, 0); +module_param(nativex, int, 0); +module_param(fp, int, 0); +module_param(crt, int, 0); static int chip3D; diff -puN drivers/video/vfb.c~remove-module_parm-from-allyesconfig-almost drivers/video/vfb.c --- 25/drivers/video/vfb.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.942626520 -0700 +++ 25-akpm/drivers/video/vfb.c 2004-10-25 01:37:32.271576512 -0700 @@ -35,7 +35,7 @@ static void *videomemory; static u_long videomemorysize = VIDEOMEMSIZE; -MODULE_PARM(videomemorysize, "l"); +module_param(videomemorysize, ulong, 0); static struct fb_var_screeninfo vfb_default __initdata = { .xres = 640, @@ -70,7 +70,7 @@ static struct fb_fix_screeninfo vfb_fix }; static int vfb_enable __initdata = 0; /* disabled by default */ -MODULE_PARM(vfb_enable, "i"); +module_param(vfb_enable, bool, 0); /* * Interface used by the world diff -puN sound/oss/aci.c~remove-module_parm-from-allyesconfig-almost sound/oss/aci.c --- 25/sound/oss/aci.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.944626216 -0700 +++ 25-akpm/sound/oss/aci.c 2004-10-25 01:49:32.732049872 -0700 @@ -91,11 +91,11 @@ static int reset = 1; #endif static int ide=-1; -MODULE_PARM(ide,"i"); +module_param(ide, int, 0); MODULE_PARM_DESC(ide,"1 enable, 0 disable ide-port - untested" " default: do nothing"); static int wss=-1; -MODULE_PARM(wss,"i"); +module_param(wss, int, 0); MODULE_PARM_DESC(wss,"change between ACI/WSS-mixer; use 0 and 1 - untested" " default: do nothing; for PCM1-pro only"); diff -puN sound/oss/ad1848.c~remove-module_parm-from-allyesconfig-almost sound/oss/ad1848.c --- 25/sound/oss/ad1848.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.945626064 -0700 +++ 25-akpm/sound/oss/ad1848.c 2004-10-25 01:37:32.274576056 -0700 @@ -2905,19 +2905,19 @@ static int __initdata dma = -1; static int __initdata dma2 = -1; static int __initdata type = 0; -MODULE_PARM(io, "i"); /* I/O for a raw AD1848 card */ -MODULE_PARM(irq, "i"); /* IRQ to use */ -MODULE_PARM(dma, "i"); /* First DMA channel */ -MODULE_PARM(dma2, "i"); /* Second DMA channel */ -MODULE_PARM(type, "i"); /* Card type */ -MODULE_PARM(deskpro_xl, "i"); /* Special magic for Deskpro XL boxen */ -MODULE_PARM(deskpro_m, "i"); /* Special magic for Deskpro M box */ -MODULE_PARM(soundpro, "i"); /* More special magic for SoundPro chips */ +module_param(io, int, 0); /* I/O for a raw AD1848 card */ +module_param(irq, int, 0); /* IRQ to use */ +module_param(dma, int, 0); /* First DMA channel */ +module_param(dma2, int, 0); /* Second DMA channel */ +module_param(type, int, 0); /* Card type */ +module_param(deskpro_xl, bool, 0); /* Special magic for Deskpro XL boxen */ +module_param(deskpro_m, bool, 0); /* Special magic for Deskpro M box */ +module_param(soundpro, bool, 0); /* More special magic for SoundPro chips */ #ifdef CONFIG_PNP -MODULE_PARM(isapnp, "i"); -MODULE_PARM(isapnpjump, "i"); -MODULE_PARM(reverse, "i"); +module_param(isapnp, int, 0); +module_param(isapnpjump, int, 0); +module_param(reverse, bool, 0); MODULE_PARM_DESC(isapnp, "When set to 0, Plug & Play support will be disabled"); MODULE_PARM_DESC(isapnpjump, "Jumps to a specific slot in the driver's PnP table. Use the source, Luke."); MODULE_PARM_DESC(reverse, "When set to 1, will reverse ISAPnP search order"); diff -puN sound/oss/adlib_card.c~remove-module_parm-from-allyesconfig-almost sound/oss/adlib_card.c --- 25/sound/oss/adlib_card.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.947625760 -0700 +++ 25-akpm/sound/oss/adlib_card.c 2004-10-25 01:37:32.274576056 -0700 @@ -31,7 +31,7 @@ static struct address_info cfg; static int __initdata io = -1; -MODULE_PARM(io, "i"); +module_param(io, int, 0); static int __init init_adlib(void) { diff -puN sound/oss/aedsp16.c~remove-module_parm-from-allyesconfig-almost sound/oss/aedsp16.c --- 25/sound/oss/aedsp16.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.948625608 -0700 +++ 25-akpm/sound/oss/aedsp16.c 2004-10-25 01:37:32.275575904 -0700 @@ -1311,17 +1311,17 @@ static int __initdata mpu_irq = -1; static int __initdata mss_base = -1; static int __initdata mpu_base = -1; -MODULE_PARM(io, "i"); +module_param(io, int, 0); MODULE_PARM_DESC(io, "I/O base address (0x220 0x240)"); -MODULE_PARM(irq, "i"); +module_param(irq, int, 0); MODULE_PARM_DESC(irq, "IRQ line (5 7 9 10 11)"); -MODULE_PARM(dma, "i"); +module_param(dma, int, 0); MODULE_PARM_DESC(dma, "dma line (0 1 3)"); -MODULE_PARM(mpu_irq, "i"); +module_param(mpu_irq, int, 0); MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ line (5 7 9 10 0)"); -MODULE_PARM(mss_base, "i"); +module_param(mss_base, int, 0); MODULE_PARM_DESC(mss_base, "MSS emulation I/O base address (0x530 0xE80)"); -MODULE_PARM(mpu_base, "i"); +module_param(mpu_base, int, 0); MODULE_PARM_DESC(mpu_base,"MPU-401 I/O base address (0x300 0x310 0x320 0x330)"); MODULE_AUTHOR("Riccardo Facchetti "); MODULE_DESCRIPTION("Audio Excel DSP 16 Driver Version " VERSION); diff -puN sound/oss/ali5455.c~remove-module_parm-from-allyesconfig-almost sound/oss/ali5455.c --- 25/sound/oss/ali5455.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.950625304 -0700 +++ 25-akpm/sound/oss/ali5455.c 2004-10-25 01:37:32.278575448 -0700 @@ -3651,12 +3651,13 @@ static int ali_pm_resume(struct pci_dev MODULE_AUTHOR(""); MODULE_DESCRIPTION("ALI 5455 audio support"); MODULE_LICENSE("GPL"); -MODULE_PARM(clocking, "i"); -MODULE_PARM(strict_clocking, "i"); -MODULE_PARM(codec_pcmout_share_spdif_locked, "i"); -MODULE_PARM(codec_independent_spdif_locked, "i"); -MODULE_PARM(controller_pcmout_share_spdif_locked, "i"); -MODULE_PARM(controller_independent_spdif_locked, "i"); +module_param(clocking, int, 0); +/* FIXME: bool? */ +module_param(strict_clocking, uint, 0); +module_param(codec_pcmout_share_spdif_locked, uint, 0); +module_param(codec_independent_spdif_locked, uint, 0); +module_param(controller_pcmout_share_spdif_locked, uint, 0); +module_param(controller_independent_spdif_locked, uint, 0); #define ALI5455_MODULE_NAME "ali5455" static struct pci_driver ali_pci_driver = { .name = ALI5455_MODULE_NAME, diff -puN sound/oss/awe_wave.c~remove-module_parm-from-allyesconfig-almost sound/oss/awe_wave.c --- 25/sound/oss/awe_wave.c~remove-module_parm-from-allyesconfig-almost 2004-10-25 01:37:31.952625000 -0700 +++ 25-akpm/sound/oss/awe_wave.c 2004-10-25 01:37:32.282574840 -0700 @@ -219,11 +219,11 @@ MODULE_AUTHOR("Takashi Iwai "); MODULE_DESCRIPTION ("Turtle Beach WaveFront Linux Driver"); MODULE_LICENSE("GPL"); -MODULE_PARM (io,"i"); -MODULE_PARM (irq,"i"); +module_param (io, int, 0); +module_param (irq, int, 0); static int __init init_wavfront (void) { _