public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-17 12:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Annotation of module parameters that specify device settings

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIVAwUAWPiW6vSw1s6N8H32AQLOrw/+NTqGf7bjq+64YKS6NfR0XDgE+wNJltGO
 ck7zJW3NHIg76RNu8s0I9xg5aVmwizz3Z5DGROZquaolnezux4tQihZ3AFyxIzLc
 +Y3WHYagcML7yFfjl/WznCLRD5EW3yPln4lCvQO0nW/xICRYeRI057JaIbi2Dtek
 BhcXt3c4AjXDLdYJkgtHV3p2R2mt8hcdFdWqqx6s7JaIThZNRGNzxAgtbcB9k5IW
 HVG9ZEIL73VBYWHrYivzjHYF5rBnNCPt87eOwDQeTOSkhv8te+u9k+bH8vxZw1T0
 XUtDrLBndKiuVo2GUfLkkF8LItx3Q9eLCJYy0joaIliyPqTEsPx9KjQ+Af0cxS9s
 ZPCZ5SYf96stKmDeL5xaMfrAmeyVHJ4lc4JTOqdzbIT8blsOSfYO/03p0ALShSDv
 /RQLaKGlf8Bjoy8PwKFcXb4sIDufcd/U1Av/EMFXxOfgN/u2JUkGKq6EaIM5B68L
 fHPje+aR9VNELPmPjwNOWtmN4I79EH3EItQf7zv0KG+UeKhcHLx/EAcSJ3ZRKEkH
 Lathg7pPOEJGArPiVO79TZzBG01ADn1aiwv65XObMzNZ+54xI/mN/Y1DNF/kL5jU
 XzvNzEjFt8mwMIZGVNdAt4+pDyMfIZGZSyUkSRKFnaQZMIvQrfQIU9RLBYLX5eOx
 +/p0VkIwDpg=
 =lbS7
 -----END PGP SIGNATURE-----

Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull hw lockdown support from David Howells:
 "Annotation of module parameters that configure hardware resources
  including ioports, iomem addresses, irq lines and dma channels.

  This allows a future patch to prohibit the use of such module
  parameters to prevent that hardware from being abused to gain access
  to the running kernel image as part of locking the kernel down under
  UEFI secure boot conditions.

  Annotations are made by changing:

        module_param(n, t, p)
        module_param_named(n, v, t, p)
        module_param_array(n, t, m, p)

  to:

        module_param_hw(n, t, hwtype, p)
        module_param_hw_named(n, v, t, hwtype, p)
        module_param_hw_array(n, t, hwtype, m, p)

  where the module parameter refers to a hardware setting

  hwtype specifies the type of the resource being configured. This can
  be one of:

        ioport          Module parameter configures an I/O port
        iomem           Module parameter configures an I/O mem address
        ioport_or_iomem Module parameter could be either (runtime set)
        irq             Module parameter configures an I/O port
        dma             Module parameter configures a DMA channel
        dma_addr        Module parameter configures a DMA buffer address
        other           Module parameter configures some other value

  Note that the hwtype is compile checked, but not currently stored (the
  lockdown code probably won't require it). It is, however, there for
  future use.

  A bonus is that the hwtype can also be used for grepping.

  The intention is for the kernel to ignore or reject attempts to set
  annotated module parameters if lockdown is enabled. This applies to
  options passed on the boot command line, passed to insmod/modprobe or
  direct twiddling in /sys/module/ parameter files.

  The module initialisation then needs to handle the parameter not being
  set, by (1) giving an error, (2) probing for a value or (3) using a
  reasonable default.

  What I can't do is just reject a module out of hand because it may
  take a hardware setting in the module parameters. Some important
  modules, some ipmi stuff for instance, both probe for hardware and
  allow hardware to be manually specified; if the driver is aborts with
  any error, you don't get any ipmi hardware.

  Further, trying to do this entirely in the module initialisation code
  doesn't protect against sysfs twiddling.

  [!] Note that in and of itself, this series of patches should have no
      effect on the the size of the kernel or code execution - that is
      left to a patch in the next series to effect. It does mark
      annotated kernel parameters with a KERNEL_PARAM_FL_HWPARAM flag in
      an already existing field"

* tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs: (38 commits)
  Annotate hardware config module parameters in sound/pci/
  Annotate hardware config module parameters in sound/oss/
  Annotate hardware config module parameters in sound/isa/
  Annotate hardware config module parameters in sound/drivers/
  Annotate hardware config module parameters in fs/pstore/
  Annotate hardware config module parameters in drivers/watchdog/
  Annotate hardware config module parameters in drivers/video/
  Annotate hardware config module parameters in drivers/tty/
  Annotate hardware config module parameters in drivers/staging/vme/
  Annotate hardware config module parameters in drivers/staging/speakup/
  Annotate hardware config module parameters in drivers/staging/media/
  Annotate hardware config module parameters in drivers/scsi/
  Annotate hardware config module parameters in drivers/pcmcia/
  Annotate hardware config module parameters in drivers/pci/hotplug/
  Annotate hardware config module parameters in drivers/parport/
  Annotate hardware config module parameters in drivers/net/wireless/
  Annotate hardware config module parameters in drivers/net/wan/
  Annotate hardware config module parameters in drivers/net/irda/
  Annotate hardware config module parameters in drivers/net/hamradio/
  Annotate hardware config module parameters in drivers/net/ethernet/
  ...
This commit is contained in:
Linus Torvalds 2017-05-10 19:13:03 -07:00
commit 291b38a756
137 changed files with 490 additions and 427 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/mm/testmmiotrace.c
View file

@ -9,7 +9,7 @@
#include <linux/mmiotrace.h> #include <linux/mmiotrace.h>
static unsigned long mmio_address; static unsigned long mmio_address;
module_param(mmio_address, ulong, 0); module_param_hw(mmio_address, ulong, iomem, 0);
MODULE_PARM_DESC(mmio_address, " Start address of the mapping of 16 kB " MODULE_PARM_DESC(mmio_address, " Start address of the mapping of 16 kB "
"(or 8 MB if read_far is non-zero)."); "(or 8 MB if read_far is non-zero).");

4
drivers/char/applicom.c
View file

@ -94,9 +94,9 @@ static struct applicom_board {
static unsigned int irq = 0; /* interrupt number IRQ */ static unsigned int irq = 0; /* interrupt number IRQ */
static unsigned long mem = 0; /* physical segment of board */ static unsigned long mem = 0; /* physical segment of board */
module_param(irq, uint, 0); module_param_hw(irq, uint, irq, 0);
MODULE_PARM_DESC(irq, "IRQ of the Applicom board"); MODULE_PARM_DESC(irq, "IRQ of the Applicom board");
module_param(mem, ulong, 0); module_param_hw(mem, ulong, iomem, 0);
MODULE_PARM_DESC(mem, "Shared Memory Address of Applicom board"); MODULE_PARM_DESC(mem, "Shared Memory Address of Applicom board");
static unsigned int numboards; /* number of installed boards */ static unsigned int numboards; /* number of installed boards */

14
drivers/char/ipmi/ipmi_si_intf.c
View file

@ -1375,39 +1375,39 @@ MODULE_PARM_DESC(type, "Defines the type of each interface, each"
" interface separated by commas. The types are 'kcs'," " interface separated by commas. The types are 'kcs',"
" 'smic', and 'bt'. For example si_type=kcs,bt will set" " 'smic', and 'bt'. For example si_type=kcs,bt will set"
" the first interface to kcs and the second to bt"); " the first interface to kcs and the second to bt");
module_param_array(addrs, ulong, &num_addrs, 0); module_param_hw_array(addrs, ulong, iomem, &num_addrs, 0);
MODULE_PARM_DESC(addrs, "Sets the memory address of each interface, the" MODULE_PARM_DESC(addrs, "Sets the memory address of each interface, the"
" addresses separated by commas. Only use if an interface" " addresses separated by commas. Only use if an interface"
" is in memory. Otherwise, set it to zero or leave" " is in memory. Otherwise, set it to zero or leave"
" it blank."); " it blank.");
module_param_array(ports, uint, &num_ports, 0); module_param_hw_array(ports, uint, ioport, &num_ports, 0);
MODULE_PARM_DESC(ports, "Sets the port address of each interface, the" MODULE_PARM_DESC(ports, "Sets the port address of each interface, the"
" addresses separated by commas. Only use if an interface" " addresses separated by commas. Only use if an interface"
" is a port. Otherwise, set it to zero or leave" " is a port. Otherwise, set it to zero or leave"
" it blank."); " it blank.");
module_param_array(irqs, int, &num_irqs, 0); module_param_hw_array(irqs, int, irq, &num_irqs, 0);
MODULE_PARM_DESC(irqs, "Sets the interrupt of each interface, the" MODULE_PARM_DESC(irqs, "Sets the interrupt of each interface, the"
" addresses separated by commas. Only use if an interface" " addresses separated by commas. Only use if an interface"
" has an interrupt. Otherwise, set it to zero or leave" " has an interrupt. Otherwise, set it to zero or leave"
" it blank."); " it blank.");
module_param_array(regspacings, int, &num_regspacings, 0); module_param_hw_array(regspacings, int, other, &num_regspacings, 0);
MODULE_PARM_DESC(regspacings, "The number of bytes between the start address" MODULE_PARM_DESC(regspacings, "The number of bytes between the start address"
" and each successive register used by the interface. For" " and each successive register used by the interface. For"
" instance, if the start address is 0xca2 and the spacing" " instance, if the start address is 0xca2 and the spacing"
" is 2, then the second address is at 0xca4. Defaults" " is 2, then the second address is at 0xca4. Defaults"
" to 1."); " to 1.");
module_param_array(regsizes, int, &num_regsizes, 0); module_param_hw_array(regsizes, int, other, &num_regsizes, 0);
MODULE_PARM_DESC(regsizes, "The size of the specific IPMI register in bytes." MODULE_PARM_DESC(regsizes, "The size of the specific IPMI register in bytes."
" This should generally be 1, 2, 4, or 8 for an 8-bit," " This should generally be 1, 2, 4, or 8 for an 8-bit,"
" 16-bit, 32-bit, or 64-bit register. Use this if you" " 16-bit, 32-bit, or 64-bit register. Use this if you"
" the 8-bit IPMI register has to be read from a larger" " the 8-bit IPMI register has to be read from a larger"
" register."); " register.");
module_param_array(regshifts, int, &num_regshifts, 0); module_param_hw_array(regshifts, int, other, &num_regshifts, 0);
MODULE_PARM_DESC(regshifts, "The amount to shift the data read from the." MODULE_PARM_DESC(regshifts, "The amount to shift the data read from the."
" IPMI register, in bits. For instance, if the data" " IPMI register, in bits. For instance, if the data"
" is read from a 32-bit word and the IPMI data is in" " is read from a 32-bit word and the IPMI data is in"
" bit 8-15, then the shift would be 8"); " bit 8-15, then the shift would be 8");
module_param_array(slave_addrs, int, &num_slave_addrs, 0); module_param_hw_array(slave_addrs, int, other, &num_slave_addrs, 0);
MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for" MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for"
" the controller. Normally this is 0x20, but can be" " the controller. Normally this is 0x20, but can be"
" overridden by this parm. This is an array indexed" " overridden by this parm. This is an array indexed"

8
drivers/char/mwave/mwavedd.c
View file

@ -80,10 +80,10 @@ int mwave_3780i_io = 0;
int mwave_uart_irq = 0; int mwave_uart_irq = 0;
int mwave_uart_io = 0; int mwave_uart_io = 0;
module_param(mwave_debug, int, 0); module_param(mwave_debug, int, 0);
module_param(mwave_3780i_irq, int, 0); module_param_hw(mwave_3780i_irq, int, irq, 0);
module_param(mwave_3780i_io, int, 0); module_param_hw(mwave_3780i_io, int, ioport, 0);
module_param(mwave_uart_irq, int, 0); module_param_hw(mwave_uart_irq, int, irq, 0);
module_param(mwave_uart_io, int, 0); module_param_hw(mwave_uart_io, int, ioport, 0);
static int mwave_open(struct inode *inode, struct file *file); static int mwave_open(struct inode *inode, struct file *file);
static int mwave_close(struct inode *inode, struct file *file); static int mwave_close(struct inode *inode, struct file *file);

2
drivers/clocksource/cs5535-clockevt.c
View file

@ -22,7 +22,7 @@
#define DRV_NAME "cs5535-clockevt" #define DRV_NAME "cs5535-clockevt"
static int timer_irq; static int timer_irq;
module_param_named(irq, timer_irq, int, 0644); module_param_hw_named(irq, timer_irq, int, irq, 0644);
MODULE_PARM_DESC(irq, "Which IRQ to use for the clock source MFGPT ticks."); MODULE_PARM_DESC(irq, "Which IRQ to use for the clock source MFGPT ticks.");
/* /*

2
drivers/cpufreq/speedstep-smi.c
View file

@ -378,7 +378,7 @@ static void __exit speedstep_exit(void)
cpufreq_unregister_driver(&speedstep_driver); cpufreq_unregister_driver(&speedstep_driver);
} }
module_param(smi_port, int, 0444); module_param_hw(smi_port, int, ioport, 0444);
module_param(smi_cmd, int, 0444); module_param(smi_cmd, int, 0444);
module_param(smi_sig, uint, 0444); module_param(smi_sig, uint, 0444);

4
drivers/gpio/gpio-104-dio-48e.c
View file

@ -33,11 +33,11 @@
static unsigned int base[MAX_NUM_DIO48E]; static unsigned int base[MAX_NUM_DIO48E];
static unsigned int num_dio48e; static unsigned int num_dio48e;
module_param_array(base, uint, &num_dio48e, 0); module_param_hw_array(base, uint, ioport, &num_dio48e, 0);
MODULE_PARM_DESC(base, "ACCES 104-DIO-48E base addresses"); MODULE_PARM_DESC(base, "ACCES 104-DIO-48E base addresses");
static unsigned int irq[MAX_NUM_DIO48E]; static unsigned int irq[MAX_NUM_DIO48E];
module_param_array(irq, uint, NULL, 0); module_param_hw_array(irq, uint, irq, NULL, 0);
MODULE_PARM_DESC(irq, "ACCES 104-DIO-48E interrupt line numbers"); MODULE_PARM_DESC(irq, "ACCES 104-DIO-48E interrupt line numbers");
/** /**

4
drivers/gpio/gpio-104-idi-48.c
View file

@ -33,11 +33,11 @@
static unsigned int base[MAX_NUM_IDI_48]; static unsigned int base[MAX_NUM_IDI_48];
static unsigned int num_idi_48; static unsigned int num_idi_48;
module_param_array(base, uint, &num_idi_48, 0); module_param_hw_array(base, uint, ioport, &num_idi_48, 0);
MODULE_PARM_DESC(base, "ACCES 104-IDI-48 base addresses"); MODULE_PARM_DESC(base, "ACCES 104-IDI-48 base addresses");
static unsigned int irq[MAX_NUM_IDI_48]; static unsigned int irq[MAX_NUM_IDI_48];
module_param_array(irq, uint, NULL, 0); module_param_hw_array(irq, uint, irq, NULL, 0);
MODULE_PARM_DESC(irq, "ACCES 104-IDI-48 interrupt line numbers"); MODULE_PARM_DESC(irq, "ACCES 104-IDI-48 interrupt line numbers");
/** /**

4
drivers/gpio/gpio-104-idio-16.c
View file

@ -33,11 +33,11 @@
static unsigned int base[MAX_NUM_IDIO_16]; static unsigned int base[MAX_NUM_IDIO_16];
static unsigned int num_idio_16; static unsigned int num_idio_16;
module_param_array(base, uint, &num_idio_16, 0); module_param_hw_array(base, uint, ioport, &num_idio_16, 0);
MODULE_PARM_DESC(base, "ACCES 104-IDIO-16 base addresses"); MODULE_PARM_DESC(base, "ACCES 104-IDIO-16 base addresses");
static unsigned int irq[MAX_NUM_IDIO_16]; static unsigned int irq[MAX_NUM_IDIO_16];
module_param_array(irq, uint, NULL, 0); module_param_hw_array(irq, uint, irq, NULL, 0);
MODULE_PARM_DESC(irq, "ACCES 104-IDIO-16 interrupt line numbers"); MODULE_PARM_DESC(irq, "ACCES 104-IDIO-16 interrupt line numbers");
/** /**

2
drivers/gpio/gpio-gpio-mm.c
View file

@ -31,7 +31,7 @@
static unsigned int base[MAX_NUM_GPIOMM]; static unsigned int base[MAX_NUM_GPIOMM];
static unsigned int num_gpiomm; static unsigned int num_gpiomm;
module_param_array(base, uint, &num_gpiomm, 0); module_param_hw_array(base, uint, ioport, &num_gpiomm, 0);
MODULE_PARM_DESC(base, "Diamond Systems GPIO-MM base addresses"); MODULE_PARM_DESC(base, "Diamond Systems GPIO-MM base addresses");
/** /**

4
drivers/gpio/gpio-ws16c48.c
View file

@ -30,11 +30,11 @@
static unsigned int base[MAX_NUM_WS16C48]; static unsigned int base[MAX_NUM_WS16C48];
static unsigned int num_ws16c48; static unsigned int num_ws16c48;
module_param_array(base, uint, &num_ws16c48, 0); module_param_hw_array(base, uint, ioport, &num_ws16c48, 0);
MODULE_PARM_DESC(base, "WinSystems WS16C48 base addresses"); MODULE_PARM_DESC(base, "WinSystems WS16C48 base addresses");
static unsigned int irq[MAX_NUM_WS16C48]; static unsigned int irq[MAX_NUM_WS16C48];
module_param_array(irq, uint, NULL, 0); module_param_hw_array(irq, uint, irq, NULL, 0);
MODULE_PARM_DESC(irq, "WinSystems WS16C48 interrupt line numbers"); MODULE_PARM_DESC(irq, "WinSystems WS16C48 interrupt line numbers");
/** /**

2
drivers/i2c/busses/i2c-ali15x3.c
View file

@ -119,7 +119,7 @@
/* If force_addr is set to anything different from 0, we forcibly enable /* If force_addr is set to anything different from 0, we forcibly enable
the device at the given address. */ the device at the given address. */
static u16 force_addr; static u16 force_addr;
module_param(force_addr, ushort, 0); module_param_hw(force_addr, ushort, ioport, 0);
MODULE_PARM_DESC(force_addr, MODULE_PARM_DESC(force_addr,
"Initialize the base address of the i2c controller"); "Initialize the base address of the i2c controller");

6
drivers/i2c/busses/i2c-elektor.c
View file

@ -323,9 +323,9 @@ MODULE_AUTHOR("Hans Berglund <hb@spacetec.no>");
MODULE_DESCRIPTION("I2C-Bus adapter routines for PCF8584 ISA bus adapter"); MODULE_DESCRIPTION("I2C-Bus adapter routines for PCF8584 ISA bus adapter");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(base, int, 0); module_param_hw(base, int, ioport_or_iomem, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param(clock, int, 0); module_param(clock, int, 0);
module_param(own, int, 0); module_param(own, int, 0);
module_param(mmapped, int, 0); module_param_hw(mmapped, int, other, 0);
module_isa_driver(i2c_elektor_driver, 1); module_isa_driver(i2c_elektor_driver, 1);

4
drivers/i2c/busses/i2c-parport-light.c
View file

@ -38,11 +38,11 @@
static struct platform_device *pdev; static struct platform_device *pdev;
static u16 base; static u16 base;
module_param(base, ushort, 0); module_param_hw(base, ushort, ioport, 0);
MODULE_PARM_DESC(base, "Base I/O address"); MODULE_PARM_DESC(base, "Base I/O address");
static int irq; static int irq;
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
MODULE_PARM_DESC(irq, "IRQ (optional)"); MODULE_PARM_DESC(irq, "IRQ (optional)");
/* ----- Low-level parallel port access ----------------------------------- */ /* ----- Low-level parallel port access ----------------------------------- */

4
drivers/i2c/busses/i2c-pca-isa.c
View file

@ -197,9 +197,9 @@ MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>");
MODULE_DESCRIPTION("ISA base PCA9564/PCA9665 driver"); MODULE_DESCRIPTION("ISA base PCA9564/PCA9665 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(base, ulong, 0); module_param_hw(base, ulong, ioport, 0);
MODULE_PARM_DESC(base, "I/O base address"); MODULE_PARM_DESC(base, "I/O base address");
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
MODULE_PARM_DESC(irq, "IRQ"); MODULE_PARM_DESC(irq, "IRQ");
module_param(clock, int, 0); module_param(clock, int, 0);
MODULE_PARM_DESC(clock, "Clock rate in hertz.\n\t\t" MODULE_PARM_DESC(clock, "Clock rate in hertz.\n\t\t"

2
drivers/i2c/busses/i2c-piix4.c
View file

@ -106,7 +106,7 @@ MODULE_PARM_DESC(force, "Forcibly enable the PIIX4. DANGEROUS!");
/* If force_addr is set to anything different from 0, we forcibly enable /* If force_addr is set to anything different from 0, we forcibly enable
the PIIX4 at the given address. VERY DANGEROUS! */ the PIIX4 at the given address. VERY DANGEROUS! */
static int force_addr; static int force_addr;
module_param (force_addr, int, 0); module_param_hw(force_addr, int, ioport, 0);
MODULE_PARM_DESC(force_addr, MODULE_PARM_DESC(force_addr,
"Forcibly enable the PIIX4 at the given address. " "Forcibly enable the PIIX4 at the given address. "
"EXTREMELY DANGEROUS!"); "EXTREMELY DANGEROUS!");

2
drivers/i2c/busses/i2c-sis5595.c
View file

@ -119,7 +119,7 @@ static int blacklist[] = {
/* If force_addr is set to anything different from 0, we forcibly enable /* If force_addr is set to anything different from 0, we forcibly enable
the device at the given address. */ the device at the given address. */
static u16 force_addr; static u16 force_addr;
module_param(force_addr, ushort, 0); module_param_hw(force_addr, ushort, ioport, 0);
MODULE_PARM_DESC(force_addr, "Initialize the base address of the i2c controller"); MODULE_PARM_DESC(force_addr, "Initialize the base address of the i2c controller");
static struct pci_driver sis5595_driver; static struct pci_driver sis5595_driver;

2
drivers/i2c/busses/i2c-viapro.c
View file

@ -94,7 +94,7 @@ MODULE_PARM_DESC(force, "Forcibly enable the SMBus. DANGEROUS!");
/* If force_addr is set to anything different from 0, we forcibly enable /* If force_addr is set to anything different from 0, we forcibly enable
the VT596 at the given address. VERY DANGEROUS! */ the VT596 at the given address. VERY DANGEROUS! */
static u16 force_addr; static u16 force_addr;
module_param(force_addr, ushort, 0); module_param_hw(force_addr, ushort, ioport, 0);
MODULE_PARM_DESC(force_addr, MODULE_PARM_DESC(force_addr,
"Forcibly enable the SMBus at the given address. " "Forcibly enable the SMBus at the given address. "
"EXTREMELY DANGEROUS!"); "EXTREMELY DANGEROUS!");

2
drivers/i2c/busses/scx200_acb.c
View file

@ -42,7 +42,7 @@ MODULE_LICENSE("GPL");
#define MAX_DEVICES 4 #define MAX_DEVICES 4
static int base[MAX_DEVICES] = { 0x820, 0x840 }; static int base[MAX_DEVICES] = { 0x820, 0x840 };
module_param_array(base, int, NULL, 0); module_param_hw_array(base, int, ioport, NULL, 0);
MODULE_PARM_DESC(base, "Base addresses for the ACCESS.bus controllers"); MODULE_PARM_DESC(base, "Base addresses for the ACCESS.bus controllers");
#define POLL_TIMEOUT (HZ/5) #define POLL_TIMEOUT (HZ/5)

2
drivers/iio/adc/stx104.c
View file

@ -49,7 +49,7 @@
static unsigned int base[max_num_isa_dev(STX104_EXTENT)]; static unsigned int base[max_num_isa_dev(STX104_EXTENT)];
static unsigned int num_stx104; static unsigned int num_stx104;
module_param_array(base, uint, &num_stx104, 0); module_param_hw_array(base, uint, ioport, &num_stx104, 0);
MODULE_PARM_DESC(base, "Apex Embedded Systems STX104 base addresses"); MODULE_PARM_DESC(base, "Apex Embedded Systems STX104 base addresses");
/** /**

2
drivers/iio/dac/cio-dac.c
View file

@ -39,7 +39,7 @@
static unsigned int base[max_num_isa_dev(CIO_DAC_EXTENT)]; static unsigned int base[max_num_isa_dev(CIO_DAC_EXTENT)];
static unsigned int num_cio_dac; static unsigned int num_cio_dac;
module_param_array(base, uint, &num_cio_dac, 0); module_param_hw_array(base, uint, ioport, &num_cio_dac, 0);
MODULE_PARM_DESC(base, "Measurement Computing CIO-DAC base addresses"); MODULE_PARM_DESC(base, "Measurement Computing CIO-DAC base addresses");
/** /**

2
drivers/input/mouse/inport.c
View file

@ -78,7 +78,7 @@ MODULE_LICENSE("GPL");
#define INPORT_IRQ 5 #define INPORT_IRQ 5
static int inport_irq = INPORT_IRQ; static int inport_irq = INPORT_IRQ;
module_param_named(irq, inport_irq, uint, 0); module_param_hw_named(irq, inport_irq, uint, irq, 0);
MODULE_PARM_DESC(irq, "IRQ number (5=default)"); MODULE_PARM_DESC(irq, "IRQ number (5=default)");
static struct input_dev *inport_dev; static struct input_dev *inport_dev;

2
drivers/input/mouse/logibm.c
View file

@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
#define LOGIBM_IRQ 5 #define LOGIBM_IRQ 5
static int logibm_irq = LOGIBM_IRQ; static int logibm_irq = LOGIBM_IRQ;
module_param_named(irq, logibm_irq, uint, 0); module_param_hw_named(irq, logibm_irq, uint, irq, 0);
MODULE_PARM_DESC(irq, "IRQ number (5=default)"); MODULE_PARM_DESC(irq, "IRQ number (5=default)");
static struct input_dev *logibm_dev; static struct input_dev *logibm_dev;

4
drivers/input/touchscreen/mk712.c
View file

@ -50,11 +50,11 @@ MODULE_DESCRIPTION("ICS MicroClock MK712 TouchScreen driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static unsigned int mk712_io = 0x260; /* Also 0x200, 0x208, 0x300 */ static unsigned int mk712_io = 0x260; /* Also 0x200, 0x208, 0x300 */
module_param_named(io, mk712_io, uint, 0); module_param_hw_named(io, mk712_io, uint, ioport, 0);
MODULE_PARM_DESC(io, "I/O base address of MK712 touchscreen controller"); MODULE_PARM_DESC(io, "I/O base address of MK712 touchscreen controller");
static unsigned int mk712_irq = 10; /* Also 12, 14, 15 */ static unsigned int mk712_irq = 10; /* Also 12, 14, 15 */
module_param_named(irq, mk712_irq, uint, 0); module_param_hw_named(irq, mk712_irq, uint, irq, 0);
MODULE_PARM_DESC(irq, "IRQ of MK712 touchscreen controller"); MODULE_PARM_DESC(irq, "IRQ of MK712 touchscreen controller");
/* eight 8-bit registers */ /* eight 8-bit registers */

4
drivers/isdn/hardware/avm/b1isa.c
View file

@ -169,8 +169,8 @@ static struct pci_dev isa_dev[MAX_CARDS];
static int io[MAX_CARDS]; static int io[MAX_CARDS];
static int irq[MAX_CARDS]; static int irq[MAX_CARDS];
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(io, "I/O base address(es)"); MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");

4
drivers/isdn/hardware/avm/t1isa.c
View file

@ -516,8 +516,8 @@ static int io[MAX_CARDS];
static int irq[MAX_CARDS]; static int irq[MAX_CARDS];
static int cardnr[MAX_CARDS]; static int cardnr[MAX_CARDS];
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_array(cardnr, int, NULL, 0); module_param_array(cardnr, int, NULL, 0);
MODULE_PARM_DESC(io, "I/O base address(es)"); MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");

10
drivers/isdn/hisax/config.c
View file

@ -350,13 +350,13 @@ MODULE_AUTHOR("Karsten Keil");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param_array(type, int, NULL, 0); module_param_array(type, int, NULL, 0);
module_param_array(protocol, int, NULL, 0); module_param_array(protocol, int, NULL, 0);
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_array(mem, int, NULL, 0); module_param_hw_array(mem, int, iomem, NULL, 0);
module_param(id, charp, 0); module_param(id, charp, 0);
#ifdef IO0_IO1 #ifdef IO0_IO1
module_param_array(io0, int, NULL, 0); module_param_hw_array(io0, int, ioport, NULL, 0);
module_param_array(io1, int, NULL, 0); module_param_hw_array(io1, int, ioport, NULL, 0);
#endif #endif
#endif /* MODULE */ #endif /* MODULE */

2
drivers/media/pci/zoran/zoran_card.c
View file

@ -69,7 +69,7 @@ MODULE_PARM_DESC(card, "Card type");
*/ */
static unsigned long vidmem; /* default = 0 - Video memory base address */ static unsigned long vidmem; /* default = 0 - Video memory base address */
module_param(vidmem, ulong, 0444); module_param_hw(vidmem, ulong, iomem, 0444);
MODULE_PARM_DESC(vidmem, "Default video memory base address"); MODULE_PARM_DESC(vidmem, "Default video memory base address");
/* /*

10
drivers/media/rc/serial_ir.c
View file

@ -833,11 +833,11 @@ MODULE_LICENSE("GPL");
module_param(type, int, 0444); module_param(type, int, 0444);
MODULE_PARM_DESC(type, "Hardware type (0 = home-brew, 1 = IRdeo, 2 = IRdeo Remote, 3 = AnimaX, 4 = IgorPlug"); MODULE_PARM_DESC(type, "Hardware type (0 = home-brew, 1 = IRdeo, 2 = IRdeo Remote, 3 = AnimaX, 4 = IgorPlug");
module_param(io, int, 0444); module_param_hw(io, int, ioport, 0444);
MODULE_PARM_DESC(io, "I/O address base (0x3f8 or 0x2f8)"); MODULE_PARM_DESC(io, "I/O address base (0x3f8 or 0x2f8)");
/* some architectures (e.g. intel xscale) have memory mapped registers */ /* some architectures (e.g. intel xscale) have memory mapped registers */
module_param(iommap, ulong, 0444); module_param_hw(iommap, ulong, other, 0444);
MODULE_PARM_DESC(iommap, "physical base for memory mapped I/O (0 = no memory mapped io)"); MODULE_PARM_DESC(iommap, "physical base for memory mapped I/O (0 = no memory mapped io)");
/* /*
@ -845,13 +845,13 @@ MODULE_PARM_DESC(iommap, "physical base for memory mapped I/O (0 = no memory map
* on 32bit word boundaries. * on 32bit word boundaries.
* See linux-kernel/drivers/tty/serial/8250/8250.c serial_in()/out() * See linux-kernel/drivers/tty/serial/8250/8250.c serial_in()/out()
*/ */
module_param(ioshift, int, 0444); module_param_hw(ioshift, int, other, 0444);
MODULE_PARM_DESC(ioshift, "shift I/O register offset (0 = no shift)"); MODULE_PARM_DESC(ioshift, "shift I/O register offset (0 = no shift)");
module_param(irq, int, 0444); module_param_hw(irq, int, irq, 0444);
MODULE_PARM_DESC(irq, "Interrupt (4 or 3)"); MODULE_PARM_DESC(irq, "Interrupt (4 or 3)");
module_param(share_irq, bool, 0444); module_param_hw(share_irq, bool, other, 0444);
MODULE_PARM_DESC(share_irq, "Share interrupts (0 = off, 1 = on)"); MODULE_PARM_DESC(share_irq, "Share interrupts (0 = off, 1 = on)");
module_param(sense, int, 0444); module_param(sense, int, 0444);

2
drivers/misc/dummy-irq.c
View file

@ -59,6 +59,6 @@ module_exit(dummy_irq_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Jiri Kosina"); MODULE_AUTHOR("Jiri Kosina");
module_param(irq, uint, 0444); module_param_hw(irq, uint, irq, 0444);
MODULE_PARM_DESC(irq, "The IRQ to register for"); MODULE_PARM_DESC(irq, "The IRQ to register for");
MODULE_DESCRIPTION("Dummy IRQ handler driver"); MODULE_DESCRIPTION("Dummy IRQ handler driver");

8
drivers/mmc/host/wbsd.c
View file

@ -2001,11 +2001,11 @@ static void __exit wbsd_drv_exit(void)
module_init(wbsd_drv_init); module_init(wbsd_drv_init);
module_exit(wbsd_drv_exit); module_exit(wbsd_drv_exit);
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
module_param_named(nopnp, param_nopnp, uint, 0444); module_param_hw_named(nopnp, param_nopnp, uint, other, 0444);
#endif #endif
module_param_named(io, param_io, uint, 0444); module_param_hw_named(io, param_io, uint, ioport, 0444);
module_param_named(irq, param_irq, uint, 0444); module_param_hw_named(irq, param_irq, uint, irq, 0444);
module_param_named(dma, param_dma, int, 0444); module_param_hw_named(dma, param_dma, int, dma, 0444);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Pierre Ossman <pierre@ossman.eu>"); MODULE_AUTHOR("Pierre Ossman <pierre@ossman.eu>");

6
drivers/net/appletalk/cops.c
View file

@ -986,9 +986,9 @@ static int cops_close(struct net_device *dev)
static struct net_device *cops_dev; static struct net_device *cops_dev;
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param(board_type, int, 0); module_param_hw(board_type, int, other, 0);
static int __init cops_module_init(void) static int __init cops_module_init(void)
{ {

6
drivers/net/appletalk/ltpc.c
View file

@ -1231,9 +1231,9 @@ static struct net_device *dev_ltpc;
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(debug, int, 0); module_param(debug, int, 0);
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param(dma, int, 0); module_param_hw(dma, int, dma, 0);
static int __init ltpc_module_init(void) static int __init ltpc_module_init(void)

4
drivers/net/arcnet/com20020-isa.c
View file

@ -129,8 +129,8 @@ static int clockp = 0;
static int clockm = 0; static int clockm = 0;
module_param(node, int, 0); module_param(node, int, 0);
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param_string(device, device, sizeof(device), 0); module_param_string(device, device, sizeof(device), 0);
module_param(timeout, int, 0); module_param(timeout, int, 0);
module_param(backplane, int, 0); module_param(backplane, int, 0);

4
drivers/net/arcnet/com90io.c
View file

@ -347,8 +347,8 @@ static int io; /* use the insmod io= irq= shmem= options */
static int irq; static int irq;
static char device[9]; /* use eg. device=arc1 to change name */ static char device[9]; /* use eg. device=arc1 to change name */
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param_string(device, device, sizeof(device), 0); module_param_string(device, device, sizeof(device), 0);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/net/arcnet/com90xx.c
View file

@ -88,8 +88,8 @@ static int irq;
static int shmem; static int shmem;
static char device[9]; /* use eg. device=arc1 to change name */ static char device[9]; /* use eg. device=arc1 to change name */
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param(shmem, int, 0); module_param(shmem, int, 0);
module_param_string(device, device, sizeof(device), 0); module_param_string(device, device, sizeof(device), 0);

8
drivers/net/can/cc770/cc770_isa.c
View file

@ -82,16 +82,16 @@ static u8 cor[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static u8 bcr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff}; static u8 bcr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1}; static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
module_param_array(port, ulong, NULL, S_IRUGO); module_param_hw_array(port, ulong, ioport, NULL, S_IRUGO);
MODULE_PARM_DESC(port, "I/O port number"); MODULE_PARM_DESC(port, "I/O port number");
module_param_array(mem, ulong, NULL, S_IRUGO); module_param_hw_array(mem, ulong, iomem, NULL, S_IRUGO);
MODULE_PARM_DESC(mem, "I/O memory address"); MODULE_PARM_DESC(mem, "I/O memory address");
module_param_array(indirect, int, NULL, S_IRUGO); module_param_hw_array(indirect, int, ioport, NULL, S_IRUGO);
MODULE_PARM_DESC(indirect, "Indirect access via address and data port"); MODULE_PARM_DESC(indirect, "Indirect access via address and data port");
module_param_array(irq, int, NULL, S_IRUGO); module_param_hw_array(irq, int, irq, NULL, S_IRUGO);
MODULE_PARM_DESC(irq, "IRQ number"); MODULE_PARM_DESC(irq, "IRQ number");
module_param_array(clk, int, NULL, S_IRUGO); module_param_array(clk, int, NULL, S_IRUGO);

8
drivers/net/can/sja1000/sja1000_isa.c
View file

@ -48,16 +48,16 @@ static unsigned char ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1}; static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
static spinlock_t indirect_lock[MAXDEV]; /* lock for indirect access mode */ static spinlock_t indirect_lock[MAXDEV]; /* lock for indirect access mode */
module_param_array(port, ulong, NULL, S_IRUGO); module_param_hw_array(port, ulong, ioport, NULL, S_IRUGO);
MODULE_PARM_DESC(port, "I/O port number"); MODULE_PARM_DESC(port, "I/O port number");
module_param_array(mem, ulong, NULL, S_IRUGO); module_param_hw_array(mem, ulong, iomem, NULL, S_IRUGO);
MODULE_PARM_DESC(mem, "I/O memory address"); MODULE_PARM_DESC(mem, "I/O memory address");
module_param_array(indirect, int, NULL, S_IRUGO); module_param_hw_array(indirect, int, ioport, NULL, S_IRUGO);
MODULE_PARM_DESC(indirect, "Indirect access via address and data port"); MODULE_PARM_DESC(indirect, "Indirect access via address and data port");
module_param_array(irq, int, NULL, S_IRUGO); module_param_hw_array(irq, int, irq, NULL, S_IRUGO);
MODULE_PARM_DESC(irq, "IRQ number"); MODULE_PARM_DESC(irq, "IRQ number");
module_param_array(clk, int, NULL, S_IRUGO); module_param_array(clk, int, NULL, S_IRUGO);

2
drivers/net/ethernet/3com/3c509.c
View file

@ -1371,7 +1371,7 @@ el3_resume(struct device *pdev)
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
module_param(debug,int, 0); module_param(debug,int, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param(max_interrupt_work, int, 0); module_param(max_interrupt_work, int, 0);
MODULE_PARM_DESC(debug, "debug level (0-6)"); MODULE_PARM_DESC(debug, "debug level (0-6)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");

4
drivers/net/ethernet/3com/3c59x.c
View file

@ -813,8 +813,8 @@ module_param(global_enable_wol, int, 0);
module_param_array(enable_wol, int, NULL, 0); module_param_array(enable_wol, int, NULL, 0);
module_param(rx_copybreak, int, 0); module_param(rx_copybreak, int, 0);
module_param(max_interrupt_work, int, 0); module_param(max_interrupt_work, int, 0);
module_param(compaq_ioaddr, int, 0); module_param_hw(compaq_ioaddr, int, ioport, 0);
module_param(compaq_irq, int, 0); module_param_hw(compaq_irq, int, irq, 0);
module_param(compaq_device_id, int, 0); module_param(compaq_device_id, int, 0);
module_param(watchdog, int, 0); module_param(watchdog, int, 0);
module_param(global_use_mmio, int, 0); module_param(global_use_mmio, int, 0);

4
drivers/net/ethernet/8390/ne.c
View file

@ -74,8 +74,8 @@ static int bad[MAX_NE_CARDS];
static u32 ne_msg_enable; static u32 ne_msg_enable;
#ifdef MODULE #ifdef MODULE
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_array(bad, int, NULL, 0); module_param_array(bad, int, NULL, 0);
module_param_named(msg_enable, ne_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH)); module_param_named(msg_enable, ne_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH));
MODULE_PARM_DESC(io, "I/O base address(es),required"); MODULE_PARM_DESC(io, "I/O base address(es),required");

4
drivers/net/ethernet/8390/smc-ultra.c
View file

@ -561,8 +561,8 @@ static struct net_device *dev_ultra[MAX_ULTRA_CARDS];
static int io[MAX_ULTRA_CARDS]; static int io[MAX_ULTRA_CARDS];
static int irq[MAX_ULTRA_CARDS]; static int irq[MAX_ULTRA_CARDS];
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_named(msg_enable, ultra_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH)); module_param_named(msg_enable, ultra_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH));
MODULE_PARM_DESC(io, "I/O base address(es)"); MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)"); MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");

8
drivers/net/ethernet/8390/wd.c
View file

@ -503,10 +503,10 @@ static int irq[MAX_WD_CARDS];
static int mem[MAX_WD_CARDS]; static int mem[MAX_WD_CARDS];
static int mem_end[MAX_WD_CARDS]; /* for non std. mem size */ static int mem_end[MAX_WD_CARDS]; /* for non std. mem size */
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_array(mem, int, NULL, 0); module_param_hw_array(mem, int, iomem, NULL, 0);
module_param_array(mem_end, int, NULL, 0); module_param_hw_array(mem_end, int, iomem, NULL, 0);
module_param_named(msg_enable, wd_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH)); module_param_named(msg_enable, wd_msg_enable, uint, (S_IRUSR|S_IRGRP|S_IROTH));
MODULE_PARM_DESC(io, "I/O base address(es)"); MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (ignored for PureData boards)"); MODULE_PARM_DESC(irq, "IRQ number(s) (ignored for PureData boards)");

6
drivers/net/ethernet/amd/lance.c
View file

@ -318,9 +318,9 @@ static int io[MAX_CARDS];
static int dma[MAX_CARDS]; static int dma[MAX_CARDS];
static int irq[MAX_CARDS]; static int irq[MAX_CARDS];
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(dma, int, NULL, 0); module_param_hw_array(dma, int, dma, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param(lance_debug, int, 0); module_param(lance_debug, int, 0);
MODULE_PARM_DESC(io, "LANCE/PCnet I/O base address(es),required"); MODULE_PARM_DESC(io, "LANCE/PCnet I/O base address(es),required");
MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)"); MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)");

6
drivers/net/ethernet/amd/ni65.c
View file

@ -1227,9 +1227,9 @@ static void set_multicast_list(struct net_device *dev)
#ifdef MODULE #ifdef MODULE
static struct net_device *dev_ni65; static struct net_device *dev_ni65;
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(dma, int, 0); module_param_hw(dma, int, dma, 0);
MODULE_PARM_DESC(irq, "ni6510 IRQ number (ignored for some cards)"); MODULE_PARM_DESC(irq, "ni6510 IRQ number (ignored for some cards)");
MODULE_PARM_DESC(io, "ni6510 I/O base address"); MODULE_PARM_DESC(io, "ni6510 I/O base address");
MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)"); MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");

6
drivers/net/ethernet/cirrus/cs89x0.c
View file

@ -1704,12 +1704,12 @@ static int use_dma; /* These generate unused var warnings if ALLOW_DMA = 0 */
static int dma; static int dma;
static int dmasize = 16; /* or 64 */ static int dmasize = 16; /* or 64 */
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param(debug, int, 0); module_param(debug, int, 0);
module_param_string(media, media, sizeof(media), 0); module_param_string(media, media, sizeof(media), 0);
module_param(duplex, int, 0); module_param(duplex, int, 0);
module_param(dma , int, 0); module_param_hw(dma , int, dma, 0);
module_param(dmasize , int, 0); module_param(dmasize , int, 0);
module_param(use_dma , int, 0); module_param(use_dma , int, 0);
MODULE_PARM_DESC(io, "cs89x0 I/O base address"); MODULE_PARM_DESC(io, "cs89x0 I/O base address");

2
drivers/net/ethernet/dec/tulip/de4x5.c
View file

@ -1015,7 +1015,7 @@ static int compact_infoblock(struct net_device *dev, u_char count, u_char *p
static int io=0x0;/* EDIT THIS LINE FOR YOUR CONFIGURATION IF NEEDED */ static int io=0x0;/* EDIT THIS LINE FOR YOUR CONFIGURATION IF NEEDED */
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(de4x5_debug, int, 0); module_param(de4x5_debug, int, 0);
module_param(dec_only, int, 0); module_param(dec_only, int, 0);
module_param(args, charp, 0); module_param(args, charp, 0);

2
drivers/net/ethernet/hp/hp100.c
View file

@ -2966,7 +2966,7 @@ MODULE_DESCRIPTION("HP CASCADE Architecture Driver for 100VG-AnyLan Network Adap
#define HP100_DEVICES 5 #define HP100_DEVICES 5
/* Parameters set by insmod */ /* Parameters set by insmod */
static int hp100_port[HP100_DEVICES] = { 0, [1 ... (HP100_DEVICES-1)] = -1 }; static int hp100_port[HP100_DEVICES] = { 0, [1 ... (HP100_DEVICES-1)] = -1 };
module_param_array(hp100_port, int, NULL, 0); module_param_hw_array(hp100_port, int, ioport, NULL, 0);
/* List of devices */ /* List of devices */
static struct net_device *hp100_devlist[HP100_DEVICES]; static struct net_device *hp100_devlist[HP100_DEVICES];

4
drivers/net/ethernet/realtek/atp.c
View file

@ -151,8 +151,8 @@ MODULE_LICENSE("GPL");
module_param(max_interrupt_work, int, 0); module_param(max_interrupt_work, int, 0);
module_param(debug, int, 0); module_param(debug, int, 0);
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_array(xcvr, int, NULL, 0); module_param_array(xcvr, int, NULL, 0);
MODULE_PARM_DESC(max_interrupt_work, "ATP maximum events handled per interrupt"); MODULE_PARM_DESC(max_interrupt_work, "ATP maximum events handled per interrupt");
MODULE_PARM_DESC(debug, "ATP debug level (0-7)"); MODULE_PARM_DESC(debug, "ATP debug level (0-7)");

4
drivers/net/ethernet/smsc/smc9194.c
View file

@ -1501,8 +1501,8 @@ static void smc_set_multicast_list(struct net_device *dev)
static struct net_device *devSMC9194; static struct net_device *devSMC9194;
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
module_param(ifport, int, 0); module_param(ifport, int, 0);
MODULE_PARM_DESC(io, "SMC 99194 I/O base address"); MODULE_PARM_DESC(io, "SMC 99194 I/O base address");
MODULE_PARM_DESC(irq, "SMC 99194 IRQ number"); MODULE_PARM_DESC(irq, "SMC 99194 IRQ number");

2
drivers/net/hamradio/baycom_epp.c
View file

@ -1176,7 +1176,7 @@ static int iobase[NR_PORTS] = { 0x378, };
module_param_array(mode, charp, NULL, 0); module_param_array(mode, charp, NULL, 0);
MODULE_PARM_DESC(mode, "baycom operating mode"); MODULE_PARM_DESC(mode, "baycom operating mode");
module_param_array(iobase, int, NULL, 0); module_param_hw_array(iobase, int, ioport, NULL, 0);
MODULE_PARM_DESC(iobase, "baycom io base address"); MODULE_PARM_DESC(iobase, "baycom io base address");
MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");

2
drivers/net/hamradio/baycom_par.c
View file

@ -481,7 +481,7 @@ static int iobase[NR_PORTS] = { 0x378, };
module_param_array(mode, charp, NULL, 0); module_param_array(mode, charp, NULL, 0);
MODULE_PARM_DESC(mode, "baycom operating mode; eg. par96 or picpar"); MODULE_PARM_DESC(mode, "baycom operating mode; eg. par96 or picpar");
module_param_array(iobase, int, NULL, 0); module_param_hw_array(iobase, int, ioport, NULL, 0);
MODULE_PARM_DESC(iobase, "baycom io base address"); MODULE_PARM_DESC(iobase, "baycom io base address");
MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");

4
drivers/net/hamradio/baycom_ser_fdx.c
View file

@ -614,9 +614,9 @@ static int baud[NR_PORTS] = { [0 ... NR_PORTS-1] = 1200 };
module_param_array(mode, charp, NULL, 0); module_param_array(mode, charp, NULL, 0);
MODULE_PARM_DESC(mode, "baycom operating mode; * for software DCD"); MODULE_PARM_DESC(mode, "baycom operating mode; * for software DCD");
module_param_array(iobase, int, NULL, 0); module_param_hw_array(iobase, int, ioport, NULL, 0);
MODULE_PARM_DESC(iobase, "baycom io base address"); MODULE_PARM_DESC(iobase, "baycom io base address");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "baycom irq number"); MODULE_PARM_DESC(irq, "baycom irq number");
module_param_array(baud, int, NULL, 0); module_param_array(baud, int, NULL, 0);
MODULE_PARM_DESC(baud, "baycom baud rate (300 to 4800)"); MODULE_PARM_DESC(baud, "baycom baud rate (300 to 4800)");

4
drivers/net/hamradio/baycom_ser_hdx.c
View file

@ -642,9 +642,9 @@ static int irq[NR_PORTS] = { 4, };
module_param_array(mode, charp, NULL, 0); module_param_array(mode, charp, NULL, 0);
MODULE_PARM_DESC(mode, "baycom operating mode; * for software DCD"); MODULE_PARM_DESC(mode, "baycom operating mode; * for software DCD");
module_param_array(iobase, int, NULL, 0); module_param_hw_array(iobase, int, ioport, NULL, 0);
MODULE_PARM_DESC(iobase, "baycom io base address"); MODULE_PARM_DESC(iobase, "baycom io base address");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "baycom irq number"); MODULE_PARM_DESC(irq, "baycom irq number");
MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu");

2
drivers/net/hamradio/dmascc.c
View file

@ -274,7 +274,7 @@ static unsigned long rand;
MODULE_AUTHOR("Klaus Kudielka"); MODULE_AUTHOR("Klaus Kudielka");
MODULE_DESCRIPTION("Driver for high-speed SCC boards"); MODULE_DESCRIPTION("Driver for high-speed SCC boards");
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static void __exit dmascc_exit(void) static void __exit dmascc_exit(void)

6
drivers/net/irda/ali-ircc.c
View file

@ -2207,11 +2207,11 @@ MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:" ALI_IRCC_DRIVER_NAME); MODULE_ALIAS("platform:" ALI_IRCC_DRIVER_NAME);
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "Base I/O addresses"); MODULE_PARM_DESC(io, "Base I/O addresses");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ lines"); MODULE_PARM_DESC(irq, "IRQ lines");
module_param_array(dma, int, NULL, 0); module_param_hw_array(dma, int, dma, NULL, 0);
MODULE_PARM_DESC(dma, "DMA channels"); MODULE_PARM_DESC(dma, "DMA channels");
module_init(ali_ircc_init); module_init(ali_ircc_init);

6
drivers/net/irda/nsc-ircc.c
View file

@ -2396,11 +2396,11 @@ MODULE_LICENSE("GPL");
module_param(qos_mtt_bits, int, 0); module_param(qos_mtt_bits, int, 0);
MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time");
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "Base I/O addresses"); MODULE_PARM_DESC(io, "Base I/O addresses");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ lines"); MODULE_PARM_DESC(irq, "IRQ lines");
module_param_array(dma, int, NULL, 0); module_param_hw_array(dma, int, dma, NULL, 0);
MODULE_PARM_DESC(dma, "DMA channels"); MODULE_PARM_DESC(dma, "DMA channels");
module_param(dongle_id, int, 0); module_param(dongle_id, int, 0);
MODULE_PARM_DESC(dongle_id, "Type-id of used dongle"); MODULE_PARM_DESC(dongle_id, "Type-id of used dongle");

10
drivers/net/irda/smsc-ircc2.c
View file

@ -82,24 +82,24 @@ MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings, defaults
#define DMA_INVAL 255 #define DMA_INVAL 255
static int ircc_dma = DMA_INVAL; static int ircc_dma = DMA_INVAL;
module_param(ircc_dma, int, 0); module_param_hw(ircc_dma, int, dma, 0);
MODULE_PARM_DESC(ircc_dma, "DMA channel"); MODULE_PARM_DESC(ircc_dma, "DMA channel");
#define IRQ_INVAL 255 #define IRQ_INVAL 255
static int ircc_irq = IRQ_INVAL; static int ircc_irq = IRQ_INVAL;
module_param(ircc_irq, int, 0); module_param_hw(ircc_irq, int, irq, 0);
MODULE_PARM_DESC(ircc_irq, "IRQ line"); MODULE_PARM_DESC(ircc_irq, "IRQ line");
static int ircc_fir; static int ircc_fir;
module_param(ircc_fir, int, 0); module_param_hw(ircc_fir, int, ioport, 0);
MODULE_PARM_DESC(ircc_fir, "FIR Base Address"); MODULE_PARM_DESC(ircc_fir, "FIR Base Address");
static int ircc_sir; static int ircc_sir;
module_param(ircc_sir, int, 0); module_param_hw(ircc_sir, int, ioport, 0);
MODULE_PARM_DESC(ircc_sir, "SIR Base Address"); MODULE_PARM_DESC(ircc_sir, "SIR Base Address");
static int ircc_cfg; static int ircc_cfg;
module_param(ircc_cfg, int, 0); module_param_hw(ircc_cfg, int, ioport, 0);
MODULE_PARM_DESC(ircc_cfg, "Configuration register base address"); MODULE_PARM_DESC(ircc_cfg, "Configuration register base address");
static int ircc_transceiver; static int ircc_transceiver;

4
drivers/net/irda/w83977af_ir.c
View file

@ -1263,9 +1263,9 @@ MODULE_LICENSE("GPL");
module_param(qos_mtt_bits, int, 0); module_param(qos_mtt_bits, int, 0);
MODULE_PARM_DESC(qos_mtt_bits, "Mimimum Turn Time"); MODULE_PARM_DESC(qos_mtt_bits, "Mimimum Turn Time");
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "Base I/O addresses"); MODULE_PARM_DESC(io, "Base I/O addresses");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ lines"); MODULE_PARM_DESC(irq, "IRQ lines");
/* /*

6
drivers/net/wan/cosa.c
View file

@ -232,11 +232,11 @@ static int irq[MAX_CARDS+1] = { -1, -1, -1, -1, -1, -1, 0, };
static struct class *cosa_class; static struct class *cosa_class;
#ifdef MODULE #ifdef MODULE
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "The I/O bases of the COSA or SRP cards"); MODULE_PARM_DESC(io, "The I/O bases of the COSA or SRP cards");
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "The IRQ lines of the COSA or SRP cards"); MODULE_PARM_DESC(irq, "The IRQ lines of the COSA or SRP cards");
module_param_array(dma, int, NULL, 0); module_param_hw_array(dma, int, dma, NULL, 0);
MODULE_PARM_DESC(dma, "The DMA channels of the COSA or SRP cards"); MODULE_PARM_DESC(dma, "The DMA channels of the COSA or SRP cards");
MODULE_AUTHOR("Jan \"Yenya\" Kasprzak, <kas@fi.muni.cz>"); MODULE_AUTHOR("Jan \"Yenya\" Kasprzak, <kas@fi.muni.cz>");

6
drivers/net/wan/hostess_sv11.c
View file

@ -324,11 +324,11 @@ static void sv11_shutdown(struct z8530_dev *dev)
static int io = 0x200; static int io = 0x200;
static int irq = 9; static int irq = 9;
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card"); MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card");
module_param(dma, int, 0); module_param_hw(dma, int, dma, 0);
MODULE_PARM_DESC(dma, "Set this to 1 to use DMA1/DMA3 for TX/RX"); MODULE_PARM_DESC(dma, "Set this to 1 to use DMA1/DMA3 for TX/RX");
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
MODULE_PARM_DESC(irq, "The interrupt line setting for the Comtrol Hostess SV11 card"); MODULE_PARM_DESC(irq, "The interrupt line setting for the Comtrol Hostess SV11 card");
MODULE_AUTHOR("Alan Cox"); MODULE_AUTHOR("Alan Cox");

4
drivers/net/wan/sbni.c
View file

@ -1463,8 +1463,8 @@ set_multicast_list( struct net_device *dev )
#ifdef MODULE #ifdef MODULE
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_array(baud, int, NULL, 0); module_param_array(baud, int, NULL, 0);
module_param_array(rxl, int, NULL, 0); module_param_array(rxl, int, NULL, 0);
module_param_array(mac, int, NULL, 0); module_param_array(mac, int, NULL, 0);

8
drivers/net/wan/sealevel.c
View file

@ -363,13 +363,13 @@ static int rxdma=3;
static int irq=5; static int irq=5;
static bool slow=false; static bool slow=false;
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
MODULE_PARM_DESC(io, "The I/O base of the Sealevel card"); MODULE_PARM_DESC(io, "The I/O base of the Sealevel card");
module_param(txdma, int, 0); module_param_hw(txdma, int, dma, 0);
MODULE_PARM_DESC(txdma, "Transmit DMA channel"); MODULE_PARM_DESC(txdma, "Transmit DMA channel");
module_param(rxdma, int, 0); module_param_hw(rxdma, int, dma, 0);
MODULE_PARM_DESC(rxdma, "Receive DMA channel"); MODULE_PARM_DESC(rxdma, "Receive DMA channel");
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
MODULE_PARM_DESC(irq, "The interrupt line setting for the SeaLevel card"); MODULE_PARM_DESC(irq, "The interrupt line setting for the SeaLevel card");
module_param(slow, bool, 0); module_param(slow, bool, 0);
MODULE_PARM_DESC(slow, "Set this for an older Sealevel card such as the 4012"); MODULE_PARM_DESC(slow, "Set this for an older Sealevel card such as the 4012");

4
drivers/net/wireless/cisco/airo.c
View file

@ -246,8 +246,8 @@ MODULE_DESCRIPTION("Support for Cisco/Aironet 802.11 wireless ethernet cards. "
"Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs."); "Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs.");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350");
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_array(rates, int, NULL, 0); module_param_array(rates, int, NULL, 0);
module_param_array(ssids, charp, NULL, 0); module_param_array(ssids, charp, NULL, 0);
module_param(auto_wep, int, 0); module_param(auto_wep, int, 0);

8
drivers/parport/parport_pc.c
View file

@ -3150,13 +3150,13 @@ static char *irq[PARPORT_PC_MAX_PORTS];
static char *dma[PARPORT_PC_MAX_PORTS]; static char *dma[PARPORT_PC_MAX_PORTS];
MODULE_PARM_DESC(io, "Base I/O address (SPP regs)"); MODULE_PARM_DESC(io, "Base I/O address (SPP regs)");
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io_hi, "Base I/O address (ECR)"); MODULE_PARM_DESC(io_hi, "Base I/O address (ECR)");
module_param_array(io_hi, int, NULL, 0); module_param_hw_array(io_hi, int, ioport, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ line"); MODULE_PARM_DESC(irq, "IRQ line");
module_param_array(irq, charp, NULL, 0); module_param_hw_array(irq, charp, irq, NULL, 0);
MODULE_PARM_DESC(dma, "DMA channel"); MODULE_PARM_DESC(dma, "DMA channel");
module_param_array(dma, charp, NULL, 0); module_param_hw_array(dma, charp, dma, NULL, 0);
#if defined(CONFIG_PARPORT_PC_SUPERIO) || \ #if defined(CONFIG_PARPORT_PC_SUPERIO) || \
(defined(CONFIG_PARPORT_1284) && defined(CONFIG_PARPORT_PC_FIFO)) (defined(CONFIG_PARPORT_1284) && defined(CONFIG_PARPORT_PC_FIFO))
MODULE_PARM_DESC(verbose_probing, "Log chit-chat during initialisation"); MODULE_PARM_DESC(verbose_probing, "Log chit-chat during initialisation");

2
drivers/pci/hotplug/cpcihp_generic.c
View file

@ -220,7 +220,7 @@ module_param(first_slot, byte, 0);
MODULE_PARM_DESC(first_slot, "Hotswap bus first slot number"); MODULE_PARM_DESC(first_slot, "Hotswap bus first slot number");
module_param(last_slot, byte, 0); module_param(last_slot, byte, 0);
MODULE_PARM_DESC(last_slot, "Hotswap bus last slot number"); MODULE_PARM_DESC(last_slot, "Hotswap bus last slot number");
module_param(port, ushort, 0); module_param_hw(port, ushort, ioport, 0);
MODULE_PARM_DESC(port, "#ENUM signal I/O port"); MODULE_PARM_DESC(port, "#ENUM signal I/O port");
module_param(enum_bit, uint, 0); module_param(enum_bit, uint, 0);
MODULE_PARM_DESC(enum_bit, "#ENUM signal bit (0-7)"); MODULE_PARM_DESC(enum_bit, "#ENUM signal bit (0-7)");

8
drivers/pcmcia/i82365.c
View file

@ -108,12 +108,12 @@ static int async_clock = -1;
static int cable_mode = -1; static int cable_mode = -1;
static int wakeup = 0; static int wakeup = 0;
module_param(i365_base, ulong, 0444); module_param_hw(i365_base, ulong, ioport, 0444);
module_param(ignore, int, 0444); module_param(ignore, int, 0444);
module_param(extra_sockets, int, 0444); module_param(extra_sockets, int, 0444);
module_param(irq_mask, int, 0444); module_param_hw(irq_mask, int, other, 0444);
module_param_array(irq_list, int, &irq_list_count, 0444); module_param_hw_array(irq_list, int, irq, &irq_list_count, 0444);
module_param(cs_irq, int, 0444); module_param_hw(cs_irq, int, irq, 0444);
module_param(async_clock, int, 0444); module_param(async_clock, int, 0444);
module_param(cable_mode, int, 0444); module_param(cable_mode, int, 0444);
module_param(wakeup, int, 0444); module_param(wakeup, int, 0444);

8
drivers/pcmcia/tcic.c
View file

@ -85,12 +85,12 @@ static int poll_quick = HZ/20;
/* CCLK external clock time, in nanoseconds. 70 ns = 14.31818 MHz */ /* CCLK external clock time, in nanoseconds. 70 ns = 14.31818 MHz */
static int cycle_time = 70; static int cycle_time = 70;
module_param(tcic_base, ulong, 0444); module_param_hw(tcic_base, ulong, ioport, 0444);
module_param(ignore, int, 0444); module_param(ignore, int, 0444);
module_param(do_scan, int, 0444); module_param(do_scan, int, 0444);
module_param(irq_mask, int, 0444); module_param_hw(irq_mask, int, other, 0444);
module_param_array(irq_list, int, &irq_list_count, 0444); module_param_hw_array(irq_list, int, irq, &irq_list_count, 0444);
module_param(cs_irq, int, 0444); module_param_hw(cs_irq, int, irq, 0444);
module_param(poll_interval, int, 0444); module_param(poll_interval, int, 0444);
module_param(poll_quick, int, 0444); module_param(poll_quick, int, 0444);
module_param(cycle_time, int, 0444); module_param(cycle_time, int, 0444);

4
drivers/scsi/aha152x.c
View file

@ -331,11 +331,11 @@ MODULE_LICENSE("GPL");
#if !defined(PCMCIA) #if !defined(PCMCIA)
#if defined(MODULE) #if defined(MODULE)
static int io[] = {0, 0}; static int io[] = {0, 0};
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io,"base io address of controller"); MODULE_PARM_DESC(io,"base io address of controller");
static int irq[] = {0, 0}; static int irq[] = {0, 0};
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq,"interrupt for controller"); MODULE_PARM_DESC(irq,"interrupt for controller");
static int scsiid[] = {7, 7}; static int scsiid[] = {7, 7};

2
drivers/scsi/aha1542.c
View file

@ -31,7 +31,7 @@ module_param(isapnp, bool, 0);
MODULE_PARM_DESC(isapnp, "enable PnP support (default=1)"); MODULE_PARM_DESC(isapnp, "enable PnP support (default=1)");
static int io[MAXBOARDS] = { 0x330, 0x334, 0, 0 }; static int io[MAXBOARDS] = { 0x330, 0x334, 0, 0 };
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
MODULE_PARM_DESC(io, "base IO address of controller (0x130,0x134,0x230,0x234,0x330,0x334, default=0x330,0x334)"); MODULE_PARM_DESC(io, "base IO address of controller (0x130,0x134,0x230,0x234,0x330,0x334, default=0x330,0x334)");
/* time AHA spends on the AT-bus during data transfer */ /* time AHA spends on the AT-bus during data transfer */

8
drivers/scsi/g_NCR5380.c
View file

@ -85,8 +85,8 @@ static int ncr_53c400;
static int ncr_53c400a; static int ncr_53c400a;
static int dtc_3181e; static int dtc_3181e;
static int hp_c2502; static int hp_c2502;
module_param(ncr_irq, int, 0); module_param_hw(ncr_irq, int, irq, 0);
module_param(ncr_addr, int, 0); module_param_hw(ncr_addr, int, ioport, 0);
module_param(ncr_5380, int, 0); module_param(ncr_5380, int, 0);
module_param(ncr_53c400, int, 0); module_param(ncr_53c400, int, 0);
module_param(ncr_53c400a, int, 0); module_param(ncr_53c400a, int, 0);
@ -94,11 +94,11 @@ module_param(dtc_3181e, int, 0);
module_param(hp_c2502, int, 0); module_param(hp_c2502, int, 0);
static int irq[] = { -1, -1, -1, -1, -1, -1, -1, -1 }; static int irq[] = { -1, -1, -1, -1, -1, -1, -1, -1 };
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(irq, "IRQ number(s) (0=none, 254=auto [default])"); MODULE_PARM_DESC(irq, "IRQ number(s) (0=none, 254=auto [default])");
static int base[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; static int base[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
module_param_array(base, int, NULL, 0); module_param_hw_array(base, int, ioport, NULL, 0);
MODULE_PARM_DESC(base, "base address(es)"); MODULE_PARM_DESC(base, "base address(es)");
static int card[] = { -1, -1, -1, -1, -1, -1, -1, -1 }; static int card[] = { -1, -1, -1, -1, -1, -1, -1, -1 };

2
drivers/scsi/gdth.c
View file

@ -353,7 +353,7 @@ static int probe_eisa_isa = 0;
static int force_dma32 = 0; static int force_dma32 = 0;
/* parameters for modprobe/insmod */ /* parameters for modprobe/insmod */
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param(disable, int, 0); module_param(disable, int, 0);
module_param(reserve_mode, int, 0); module_param(reserve_mode, int, 0);
module_param_array(reserve_list, int, NULL, 0); module_param_array(reserve_list, int, NULL, 0);

4
drivers/scsi/qlogicfas.c
View file

@ -137,8 +137,8 @@ err:
static struct qlogicfas408_priv *cards; static struct qlogicfas408_priv *cards;
static int iobase[MAX_QLOGICFAS]; static int iobase[MAX_QLOGICFAS];
static int irq[MAX_QLOGICFAS] = { [0 ... MAX_QLOGICFAS-1] = -1 }; static int irq[MAX_QLOGICFAS] = { [0 ... MAX_QLOGICFAS-1] = -1 };
module_param_array(iobase, int, NULL, 0); module_param_hw_array(iobase, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
MODULE_PARM_DESC(iobase, "I/O address"); MODULE_PARM_DESC(iobase, "I/O address");
MODULE_PARM_DESC(irq, "IRQ"); MODULE_PARM_DESC(irq, "IRQ");

2
drivers/staging/speakup/speakup_acntpc.c
View file

@ -310,7 +310,7 @@ static void accent_release(void)
speakup_info.port_tts = 0; speakup_info.port_tts = 0;
} }
module_param_named(port, port_forced, int, 0444); module_param_hw_named(port, port_forced, int, ioport, 0444);
module_param_named(start, synth_acntpc.startup, short, 0444); module_param_named(start, synth_acntpc.startup, short, 0444);
MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing)."); MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");

2
drivers/staging/speakup/speakup_dtlk.c
View file

@ -382,7 +382,7 @@ static void dtlk_release(void)
speakup_info.port_tts = 0; speakup_info.port_tts = 0;
} }
module_param_named(port, port_forced, int, 0444); module_param_hw_named(port, port_forced, int, ioport, 0444);
module_param_named(start, synth_dtlk.startup, short, 0444); module_param_named(start, synth_dtlk.startup, short, 0444);
MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing)."); MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");

2
drivers/staging/speakup/speakup_keypc.c
View file

@ -312,7 +312,7 @@ static void keynote_release(void)
synth_port = 0; synth_port = 0;
} }
module_param_named(port, port_forced, int, 0444); module_param_hw_named(port, port_forced, int, ioport, 0444);
module_param_named(start, synth_keypc.startup, short, 0444); module_param_named(start, synth_keypc.startup, short, 0444);
MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing)."); MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");

8
drivers/staging/vme/devices/vme_pio2_core.c
View file

@ -466,16 +466,16 @@ static void __exit pio2_exit(void)
/* These are required for each board */ /* These are required for each board */
MODULE_PARM_DESC(bus, "Enumeration of VMEbus to which the board is connected"); MODULE_PARM_DESC(bus, "Enumeration of VMEbus to which the board is connected");
module_param_array(bus, int, &bus_num, 0444); module_param_hw_array(bus, int, other, &bus_num, 0444);
MODULE_PARM_DESC(base, "Base VME address for PIO2 Registers"); MODULE_PARM_DESC(base, "Base VME address for PIO2 Registers");
module_param_array(base, long, &base_num, 0444); module_param_hw_array(base, long, other, &base_num, 0444);
MODULE_PARM_DESC(vector, "VME IRQ Vector (Lower 4 bits masked)"); MODULE_PARM_DESC(vector, "VME IRQ Vector (Lower 4 bits masked)");
module_param_array(vector, int, &vector_num, 0444); module_param_hw_array(vector, int, other, &vector_num, 0444);
MODULE_PARM_DESC(level, "VME IRQ Level"); MODULE_PARM_DESC(level, "VME IRQ Level");
module_param_array(level, int, &level_num, 0444); module_param_hw_array(level, int, other, &level_num, 0444);
MODULE_PARM_DESC(variant, "Last 4 characters of PIO2 board variant"); MODULE_PARM_DESC(variant, "Last 4 characters of PIO2 board variant");
module_param_array(variant, charp, &variant_num, 0444); module_param_array(variant, charp, &variant_num, 0444);

4
drivers/tty/cyclades.c
View file

@ -156,8 +156,8 @@ static unsigned int cy_isa_addresses[] = {
static long maddr[NR_CARDS]; static long maddr[NR_CARDS];
static int irq[NR_CARDS]; static int irq[NR_CARDS];
module_param_array(maddr, long, NULL, 0); module_param_hw_array(maddr, long, iomem, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
#endif /* CONFIG_ISA */ #endif /* CONFIG_ISA */

2
drivers/tty/moxa.c
View file

@ -179,7 +179,7 @@ MODULE_FIRMWARE("c320tunx.cod");
module_param_array(type, uint, NULL, 0); module_param_array(type, uint, NULL, 0);
MODULE_PARM_DESC(type, "card type: C218=2, C320=4"); MODULE_PARM_DESC(type, "card type: C218=2, C320=4");
module_param_array(baseaddr, ulong, NULL, 0); module_param_hw_array(baseaddr, ulong, ioport, NULL, 0);
MODULE_PARM_DESC(baseaddr, "base address"); MODULE_PARM_DESC(baseaddr, "base address");
module_param_array(numports, uint, NULL, 0); module_param_array(numports, uint, NULL, 0);
MODULE_PARM_DESC(numports, "numports (ignored for C218)"); MODULE_PARM_DESC(numports, "numports (ignored for C218)");

2
drivers/tty/mxser.c
View file

@ -183,7 +183,7 @@ static int ttymajor = MXSERMAJOR;
MODULE_AUTHOR("Casper Yang"); MODULE_AUTHOR("Casper Yang");
MODULE_DESCRIPTION("MOXA Smartio/Industio Family Multiport Board Device Driver"); MODULE_DESCRIPTION("MOXA Smartio/Industio Family Multiport Board Device Driver");
module_param_array(ioaddr, ulong, NULL, 0); module_param_hw_array(ioaddr, ulong, ioport, NULL, 0);
MODULE_PARM_DESC(ioaddr, "ISA io addresses to look for a moxa board"); MODULE_PARM_DESC(ioaddr, "ISA io addresses to look for a moxa board");
module_param(ttymajor, int, 0); module_param(ttymajor, int, 0);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

10
drivers/tty/rocket.c
View file

@ -250,15 +250,15 @@ static int sReadAiopNumChan(WordIO_t io);
MODULE_AUTHOR("Theodore Ts'o"); MODULE_AUTHOR("Theodore Ts'o");
MODULE_DESCRIPTION("Comtrol RocketPort driver"); MODULE_DESCRIPTION("Comtrol RocketPort driver");
module_param(board1, ulong, 0); module_param_hw(board1, ulong, ioport, 0);
MODULE_PARM_DESC(board1, "I/O port for (ISA) board #1"); MODULE_PARM_DESC(board1, "I/O port for (ISA) board #1");
module_param(board2, ulong, 0); module_param_hw(board2, ulong, ioport, 0);
MODULE_PARM_DESC(board2, "I/O port for (ISA) board #2"); MODULE_PARM_DESC(board2, "I/O port for (ISA) board #2");
module_param(board3, ulong, 0); module_param_hw(board3, ulong, ioport, 0);
MODULE_PARM_DESC(board3, "I/O port for (ISA) board #3"); MODULE_PARM_DESC(board3, "I/O port for (ISA) board #3");
module_param(board4, ulong, 0); module_param_hw(board4, ulong, ioport, 0);
MODULE_PARM_DESC(board4, "I/O port for (ISA) board #4"); MODULE_PARM_DESC(board4, "I/O port for (ISA) board #4");
module_param(controller, ulong, 0); module_param_hw(controller, ulong, ioport, 0);
MODULE_PARM_DESC(controller, "I/O port for (ISA) rocketport controller"); MODULE_PARM_DESC(controller, "I/O port for (ISA) rocketport controller");
module_param(support_low_speed, bool, 0); module_param(support_low_speed, bool, 0);
MODULE_PARM_DESC(support_low_speed, "1 means support 50 baud, 0 means support 460400 baud"); MODULE_PARM_DESC(support_low_speed, "1 means support 50 baud, 0 means support 460400 baud");

4
drivers/tty/serial/8250/8250_core.c
View file

@ -1191,7 +1191,7 @@ module_exit(serial8250_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Generic 8250/16x50 serial driver"); MODULE_DESCRIPTION("Generic 8250/16x50 serial driver");
module_param(share_irqs, uint, 0644); module_param_hw(share_irqs, uint, other, 0644);
MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices (unsafe)"); MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices (unsafe)");
module_param(nr_uarts, uint, 0644); module_param(nr_uarts, uint, 0644);
@ -1201,7 +1201,7 @@ module_param(skip_txen_test, uint, 0644);
MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time"); MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init time");
#ifdef CONFIG_SERIAL_8250_RSA #ifdef CONFIG_SERIAL_8250_RSA
module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444); module_param_hw_array(probe_rsa, ulong, ioport, &probe_rsa_count, 0444);
MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA"); MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA");
#endif #endif
MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR); MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR);

6
drivers/tty/synclink.c
View file

@ -869,9 +869,9 @@ static int txholdbufs[MAX_TOTAL_DEVICES];
module_param(break_on_load, bool, 0); module_param(break_on_load, bool, 0);
module_param(ttymajor, int, 0); module_param(ttymajor, int, 0);
module_param_array(io, int, NULL, 0); module_param_hw_array(io, int, ioport, NULL, 0);
module_param_array(irq, int, NULL, 0); module_param_hw_array(irq, int, irq, NULL, 0);
module_param_array(dma, int, NULL, 0); module_param_hw_array(dma, int, dma, NULL, 0);
module_param(debug_level, int, 0); module_param(debug_level, int, 0);
module_param_array(maxframe, int, NULL, 0); module_param_array(maxframe, int, NULL, 0);
module_param_array(txdmabufs, int, NULL, 0); module_param_array(txdmabufs, int, NULL, 0);

8
drivers/video/fbdev/arcfb.c
View file

@ -645,17 +645,17 @@ module_param(nosplash, uint, 0);
MODULE_PARM_DESC(nosplash, "Disable doing the splash screen"); MODULE_PARM_DESC(nosplash, "Disable doing the splash screen");
module_param(arcfb_enable, uint, 0); module_param(arcfb_enable, uint, 0);
MODULE_PARM_DESC(arcfb_enable, "Enable communication with Arc board"); MODULE_PARM_DESC(arcfb_enable, "Enable communication with Arc board");
module_param(dio_addr, ulong, 0); module_param_hw(dio_addr, ulong, ioport, 0);
MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480"); MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480");
module_param(cio_addr, ulong, 0); module_param_hw(cio_addr, ulong, ioport, 0);
MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400"); MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400");
module_param(c2io_addr, ulong, 0); module_param_hw(c2io_addr, ulong, ioport, 0);
MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408"); MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408");
module_param(splashval, ulong, 0); module_param(splashval, ulong, 0);
MODULE_PARM_DESC(splashval, "Splash pattern: 0xFF is black, 0x00 is green"); MODULE_PARM_DESC(splashval, "Splash pattern: 0xFF is black, 0x00 is green");
module_param(tuhold, ulong, 0); module_param(tuhold, ulong, 0);
MODULE_PARM_DESC(tuhold, "Time to hold between strobing data to Arc board"); MODULE_PARM_DESC(tuhold, "Time to hold between strobing data to Arc board");
module_param(irq, uint, 0); module_param_hw(irq, uint, irq, 0);
MODULE_PARM_DESC(irq, "IRQ for the Arc board"); MODULE_PARM_DESC(irq, "IRQ for the Arc board");
module_init(arcfb_init); module_init(arcfb_init);

6
drivers/video/fbdev/n411.c
View file

@ -193,11 +193,11 @@ module_exit(n411_exit);
module_param(nosplash, uint, 0); module_param(nosplash, uint, 0);
MODULE_PARM_DESC(nosplash, "Disable doing the splash screen"); MODULE_PARM_DESC(nosplash, "Disable doing the splash screen");
module_param(dio_addr, ulong, 0); module_param_hw(dio_addr, ulong, ioport, 0);
MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480"); MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480");
module_param(cio_addr, ulong, 0); module_param_hw(cio_addr, ulong, ioport, 0);
MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400"); MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400");
module_param(c2io_addr, ulong, 0); module_param_hw(c2io_addr, ulong, ioport, 0);
MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408"); MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408");
module_param(splashval, ulong, 0); module_param(splashval, ulong, 0);
MODULE_PARM_DESC(splashval, "Splash pattern: 0x00 is black, 0x01 is white"); MODULE_PARM_DESC(splashval, "Splash pattern: 0x00 is black, 0x01 is white");

2
drivers/watchdog/cpu5wdt.c
View file

@ -289,7 +289,7 @@ MODULE_DESCRIPTION("sma cpu5 watchdog driver");
MODULE_SUPPORTED_DEVICE("sma cpu5 watchdog"); MODULE_SUPPORTED_DEVICE("sma cpu5 watchdog");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(port, int, 0); module_param_hw(port, int, ioport, 0);
MODULE_PARM_DESC(port, "base address of watchdog card, default is 0x91"); MODULE_PARM_DESC(port, "base address of watchdog card, default is 0x91");
module_param(verbose, int, 0); module_param(verbose, int, 0);

4
drivers/watchdog/eurotechwdt.c
View file

@ -97,9 +97,9 @@ MODULE_PARM_DESC(nowayout,
#define WDT_TIMER_CFG 0xf3 #define WDT_TIMER_CFG 0xf3
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
MODULE_PARM_DESC(io, "Eurotech WDT io port (default=0x3f0)"); MODULE_PARM_DESC(io, "Eurotech WDT io port (default=0x3f0)");
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
MODULE_PARM_DESC(irq, "Eurotech WDT irq (default=10)"); MODULE_PARM_DESC(irq, "Eurotech WDT irq (default=10)");
module_param(ev, charp, 0); module_param(ev, charp, 0);
MODULE_PARM_DESC(ev, "Eurotech WDT event type (default is `int')"); MODULE_PARM_DESC(ev, "Eurotech WDT event type (default is `int')");

2
drivers/watchdog/pc87413_wdt.c
View file

@ -579,7 +579,7 @@ MODULE_AUTHOR("Marcus Junker <junker@anduras.de>");
MODULE_DESCRIPTION("PC87413 WDT driver"); MODULE_DESCRIPTION("PC87413 WDT driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
MODULE_PARM_DESC(io, MODNAME " I/O port (default: " MODULE_PARM_DESC(io, MODNAME " I/O port (default: "
__MODULE_STRING(IO_DEFAULT) ")."); __MODULE_STRING(IO_DEFAULT) ").");

2
drivers/watchdog/sc1200wdt.c
View file

@ -88,7 +88,7 @@ MODULE_PARM_DESC(isapnp,
"When set to 0 driver ISA PnP support will be disabled"); "When set to 0 driver ISA PnP support will be disabled");
#endif #endif
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
MODULE_PARM_DESC(io, "io port"); MODULE_PARM_DESC(io, "io port");
module_param(timeout, int, 0); module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1"); MODULE_PARM_DESC(timeout, "range is 0-255 minutes, default is 1");

4
drivers/watchdog/wdt.c
View file

@ -78,9 +78,9 @@ static int irq = 11;
static DEFINE_SPINLOCK(wdt_lock); static DEFINE_SPINLOCK(wdt_lock);
module_param(io, int, 0); module_param_hw(io, int, ioport, 0);
MODULE_PARM_DESC(io, "WDT io port (default=0x240)"); MODULE_PARM_DESC(io, "WDT io port (default=0x240)");
module_param(irq, int, 0); module_param_hw(irq, int, irq, 0);
MODULE_PARM_DESC(irq, "WDT irq (default=11)"); MODULE_PARM_DESC(irq, "WDT irq (default=11)");
/* Support for the Fan Tachometer on the WDT501-P */ /* Support for the Fan Tachometer on the WDT501-P */

2
fs/pstore/ram.c
View file

@ -58,7 +58,7 @@ module_param_named(pmsg_size, ramoops_pmsg_size, ulong, 0400);
MODULE_PARM_DESC(pmsg_size, "size of user space message log"); MODULE_PARM_DESC(pmsg_size, "size of user space message log");
static unsigned long long mem_address; static unsigned long long mem_address;
module_param(mem_address, ullong, 0400); module_param_hw(mem_address, ullong, other, 0400);
MODULE_PARM_DESC(mem_address, MODULE_PARM_DESC(mem_address,
"start of reserved RAM used to store oops/panic logs"); "start of reserved RAM used to store oops/panic logs");

65
include/linux/moduleparam.h
View file

@ -60,9 +60,11 @@ struct kernel_param_ops {
* Flags available for kernel_param * Flags available for kernel_param
* *
* UNSAFE - the parameter is dangerous and setting it will taint the kernel * UNSAFE - the parameter is dangerous and setting it will taint the kernel
* HWPARAM - Hardware param not permitted in lockdown mode
*/ */
enum { enum {
KERNEL_PARAM_FL_UNSAFE = (1 << 0) KERNEL_PARAM_FL_UNSAFE = (1 << 0),
KERNEL_PARAM_FL_HWPARAM = (1 << 1),
}; };
struct kernel_param { struct kernel_param {
@ -451,6 +453,67 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
perm, -1, 0); \ perm, -1, 0); \
__MODULE_PARM_TYPE(name, "array of " #type) __MODULE_PARM_TYPE(name, "array of " #type)
enum hwparam_type {
hwparam_ioport, /* Module parameter configures an I/O port */
hwparam_iomem, /* Module parameter configures an I/O mem address */
hwparam_ioport_or_iomem, /* Module parameter could be either, depending on other option */
hwparam_irq, /* Module parameter configures an I/O port */
hwparam_dma, /* Module parameter configures a DMA channel */
hwparam_dma_addr, /* Module parameter configures a DMA buffer address */
hwparam_other, /* Module parameter configures some other value */
};
/**
* module_param_hw_named - A parameter representing a hw parameters
* @name: a valid C identifier which is the parameter name.
* @value: the actual lvalue to alter.
* @type: the type of the parameter
* @hwtype: what the value represents (enum hwparam_type)
* @perm: visibility in sysfs.
*
* Usually it's a good idea to have variable names and user-exposed names the
* same, but that's harder if the variable must be non-static or is inside a
* structure. This allows exposure under a different name.
*/
#define module_param_hw_named(name, value, type, hwtype, perm) \
param_check_##type(name, &(value)); \
__module_param_call(MODULE_PARAM_PREFIX, name, \
&param_ops_##type, &value, \
perm, -1, \
KERNEL_PARAM_FL_HWPARAM | (hwparam_##hwtype & 0)); \
__MODULE_PARM_TYPE(name, #type)
#define module_param_hw(name, type, hwtype, perm) \
module_param_hw_named(name, name, type, hwtype, perm)
/**
* module_param_hw_array - A parameter representing an array of hw parameters
* @name: the name of the array variable
* @type: the type, as per module_param()
* @hwtype: what the value represents (enum hwparam_type)
* @nump: optional pointer filled in with the number written
* @perm: visibility in sysfs
*
* Input and output are as comma-separated values. Commas inside values
* don't work properly (eg. an array of charp).
*
* ARRAY_SIZE(@name) is used to determine the number of elements in the
* array, so the definition must be visible.
*/
#define module_param_hw_array(name, type, hwtype, nump, perm) \
param_check_##type(name, &(name)[0]); \
static const struct kparam_array __param_arr_##name \
= { .max = ARRAY_SIZE(name), .num = nump, \
.ops = &param_ops_##type, \
.elemsize = sizeof(name[0]), .elem = name }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
&param_array_ops, \
.arr = &__param_arr_##name, \
perm, -1, \
KERNEL_PARAM_FL_HWPARAM | (hwparam_##hwtype & 0)); \
__MODULE_PARM_TYPE(name, "array of " #type)
extern const struct kernel_param_ops param_array_ops; extern const struct kernel_param_ops param_array_ops;
extern const struct kernel_param_ops param_ops_string; extern const struct kernel_param_ops param_ops_string;

4
sound/drivers/mpu401/mpu401.c
View file

@ -53,9 +53,9 @@ MODULE_PARM_DESC(enable, "Enable MPU-401 device.");
module_param_array(pnp, bool, NULL, 0444); module_param_array(pnp, bool, NULL, 0444);
MODULE_PARM_DESC(pnp, "PnP detection for MPU-401 device."); MODULE_PARM_DESC(pnp, "PnP detection for MPU-401 device.");
#endif #endif
module_param_array(port, long, NULL, 0444); module_param_hw_array(port, long, ioport, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for MPU-401 device."); MODULE_PARM_DESC(port, "Port # for MPU-401 device.");
module_param_array(irq, int, NULL, 0444); module_param_hw_array(irq, int, irq, NULL, 0444);
MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device."); MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device.");
module_param_array(uart_enter, bool, NULL, 0444); module_param_array(uart_enter, bool, NULL, 0444);
MODULE_PARM_DESC(uart_enter, "Issue UART_ENTER command at open."); MODULE_PARM_DESC(uart_enter, "Issue UART_ENTER command at open.");

4
sound/drivers/mtpav.c
View file

@ -86,9 +86,9 @@ module_param(index, int, 0444);
MODULE_PARM_DESC(index, "Index value for MotuMTPAV MIDI."); MODULE_PARM_DESC(index, "Index value for MotuMTPAV MIDI.");
module_param(id, charp, 0444); module_param(id, charp, 0444);
MODULE_PARM_DESC(id, "ID string for MotuMTPAV MIDI."); MODULE_PARM_DESC(id, "ID string for MotuMTPAV MIDI.");
module_param(port, long, 0444); module_param_hw(port, long, ioport, 0444);
MODULE_PARM_DESC(port, "Parallel port # for MotuMTPAV MIDI."); MODULE_PARM_DESC(port, "Parallel port # for MotuMTPAV MIDI.");
module_param(irq, int, 0444); module_param_hw(irq, int, irq, 0444);
MODULE_PARM_DESC(irq, "Parallel IRQ # for MotuMTPAV MIDI."); MODULE_PARM_DESC(irq, "Parallel IRQ # for MotuMTPAV MIDI.");
module_param(hwports, int, 0444); module_param(hwports, int, 0444);
MODULE_PARM_DESC(hwports, "Hardware ports # for MotuMTPAV MIDI."); MODULE_PARM_DESC(hwports, "Hardware ports # for MotuMTPAV MIDI.");

4
sound/drivers/serial-u16550.c
View file

@ -84,9 +84,9 @@ module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for Serial MIDI."); MODULE_PARM_DESC(id, "ID string for Serial MIDI.");
module_param_array(enable, bool, NULL, 0444); module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable UART16550A chip."); MODULE_PARM_DESC(enable, "Enable UART16550A chip.");
module_param_array(port, long, NULL, 0444); module_param_hw_array(port, long, ioport, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for UART16550A chip."); MODULE_PARM_DESC(port, "Port # for UART16550A chip.");
module_param_array(irq, int, NULL, 0444); module_param_hw_array(irq, int, irq, NULL, 0444);
MODULE_PARM_DESC(irq, "IRQ # for UART16550A chip."); MODULE_PARM_DESC(irq, "IRQ # for UART16550A chip.");
module_param_array(speed, int, NULL, 0444); module_param_array(speed, int, NULL, 0444);
MODULE_PARM_DESC(speed, "Speed in bauds."); MODULE_PARM_DESC(speed, "Speed in bauds.");

6
sound/isa/ad1848/ad1848.c
View file

@ -55,11 +55,11 @@ module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard."); MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");
module_param_array(enable, bool, NULL, 0444); module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard."); MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
module_param_array(port, long, NULL, 0444); module_param_hw_array(port, long, ioport, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver."); MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
module_param_array(irq, int, NULL, 0444); module_param_hw_array(irq, int, irq, NULL, 0444);
MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver."); MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
module_param_array(dma1, int, NULL, 0444); module_param_hw_array(dma1, int, dma, NULL, 0444);
MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver."); MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");
module_param_array(thinkpad, bool, NULL, 0444); module_param_array(thinkpad, bool, NULL, 0444);
MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series."); MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series.");

2
sound/isa/adlib.c
View file

@ -27,7 +27,7 @@ module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard."); MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");
module_param_array(enable, bool, NULL, 0444); module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard."); MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
module_param_array(port, long, NULL, 0444); module_param_hw_array(port, long, ioport, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver."); MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
static int snd_adlib_match(struct device *dev, unsigned int n) static int snd_adlib_match(struct device *dev, unsigned int n)

12
sound/isa/cmi8328.c
View file

@ -51,18 +51,18 @@ MODULE_PARM_DESC(index, "Index value for CMI8328 soundcard.");
module_param_array(id, charp, NULL, 0444); module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for CMI8328 soundcard."); MODULE_PARM_DESC(id, "ID string for CMI8328 soundcard.");
module_param_array(port, long, NULL, 0444); module_param_hw_array(port, long, ioport, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for CMI8328 driver."); MODULE_PARM_DESC(port, "Port # for CMI8328 driver.");
module_param_array(irq, int, NULL, 0444); module_param_hw_array(irq, int, irq, NULL, 0444);
MODULE_PARM_DESC(irq, "IRQ # for CMI8328 driver."); MODULE_PARM_DESC(irq, "IRQ # for CMI8328 driver.");
module_param_array(dma1, int, NULL, 0444); module_param_hw_array(dma1, int, dma, NULL, 0444);
MODULE_PARM_DESC(dma1, "DMA1 for CMI8328 driver."); MODULE_PARM_DESC(dma1, "DMA1 for CMI8328 driver.");
module_param_array(dma2, int, NULL, 0444); module_param_hw_array(dma2, int, dma, NULL, 0444);
MODULE_PARM_DESC(dma2, "DMA2 for CMI8328 driver."); MODULE_PARM_DESC(dma2, "DMA2 for CMI8328 driver.");
module_param_array(mpuport, long, NULL, 0444); module_param_hw_array(mpuport, long, ioport, NULL, 0444);
MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8328 driver."); MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8328 driver.");
module_param_array(mpuirq, int, NULL, 0444); module_param_hw_array(mpuirq, int, irq, NULL, 0444);
MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8328 MPU-401 port."); MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8328 MPU-401 port.");
#ifdef SUPPORT_JOYSTICK #ifdef SUPPORT_JOYSTICK
module_param_array(gameport, bool, NULL, 0444); module_param_array(gameport, bool, NULL, 0444);

20
sound/isa/cmi8330.c
View file

@ -95,27 +95,27 @@ module_param_array(isapnp, bool, NULL, 0444);
MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard."); MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");
#endif #endif
module_param_array(sbport, long, NULL, 0444); module_param_hw_array(sbport, long, ioport, NULL, 0444);
MODULE_PARM_DESC(sbport, "Port # for CMI8330/CMI8329 SB driver."); MODULE_PARM_DESC(sbport, "Port # for CMI8330/CMI8329 SB driver.");
module_param_array(sbirq, int, NULL, 0444); module_param_hw_array(sbirq, int, irq, NULL, 0444);
MODULE_PARM_DESC(sbirq, "IRQ # for CMI8330/CMI8329 SB driver."); MODULE_PARM_DESC(sbirq, "IRQ # for CMI8330/CMI8329 SB driver.");
module_param_array(sbdma8, int, NULL, 0444); module_param_hw_array(sbdma8, int, dma, NULL, 0444);
MODULE_PARM_DESC(sbdma8, "DMA8 for CMI8330/CMI8329 SB driver."); MODULE_PARM_DESC(sbdma8, "DMA8 for CMI8330/CMI8329 SB driver.");
module_param_array(sbdma16, int, NULL, 0444); module_param_hw_array(sbdma16, int, dma, NULL, 0444);
MODULE_PARM_DESC(sbdma16, "DMA16 for CMI8330/CMI8329 SB driver."); MODULE_PARM_DESC(sbdma16, "DMA16 for CMI8330/CMI8329 SB driver.");
module_param_array(wssport, long, NULL, 0444); module_param_hw_array(wssport, long, ioport, NULL, 0444);
MODULE_PARM_DESC(wssport, "Port # for CMI8330/CMI8329 WSS driver."); MODULE_PARM_DESC(wssport, "Port # for CMI8330/CMI8329 WSS driver.");
module_param_array(wssirq, int, NULL, 0444); module_param_hw_array(wssirq, int, irq, NULL, 0444);
MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330/CMI8329 WSS driver."); MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330/CMI8329 WSS driver.");
module_param_array(wssdma, int, NULL, 0444); module_param_hw_array(wssdma, int, dma, NULL, 0444);
MODULE_PARM_DESC(wssdma, "DMA for CMI8330/CMI8329 WSS driver."); MODULE_PARM_DESC(wssdma, "DMA for CMI8330/CMI8329 WSS driver.");
module_param_array(fmport, long, NULL, 0444); module_param_hw_array(fmport, long, ioport, NULL, 0444);
MODULE_PARM_DESC(fmport, "FM port # for CMI8330/CMI8329 driver."); MODULE_PARM_DESC(fmport, "FM port # for CMI8330/CMI8329 driver.");
module_param_array(mpuport, long, NULL, 0444); module_param_hw_array(mpuport, long, ioport, NULL, 0444);
MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8330/CMI8329 driver."); MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8330/CMI8329 driver.");
module_param_array(mpuirq, int, NULL, 0444); module_param_hw_array(mpuirq, int, irq, NULL, 0444);
MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8330/CMI8329 MPU-401 port."); MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8330/CMI8329 MPU-401 port.");
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static int isa_registered; static int isa_registered;

12
sound/isa/cs423x/cs4231.c
View file

@ -55,17 +55,17 @@ module_param_array(id, charp, NULL, 0444);
MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard."); MODULE_PARM_DESC(id, "ID string for " CRD_NAME " soundcard.");
module_param_array(enable, bool, NULL, 0444); module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard."); MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
module_param_array(port, long, NULL, 0444); module_param_hw_array(port, long, ioport, NULL, 0444);
MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver."); MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
module_param_array(mpu_port, long, NULL, 0444); module_param_hw_array(mpu_port, long, ioport, NULL, 0444);
MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver."); MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");
module_param_array(irq, int, NULL, 0444); module_param_hw_array(irq, int, irq, NULL, 0444);
MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver."); MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
module_param_array(mpu_irq, int, NULL, 0444); module_param_hw_array(mpu_irq, int, irq, NULL, 0444);
MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver."); MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");
module_param_array(dma1, int, NULL, 0444); module_param_hw_array(dma1, int, dma, NULL, 0444);
MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver."); MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");
module_param_array(dma2, int, NULL, 0444); module_param_hw_array(dma2, int, dma, NULL, 0444);
MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver."); MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver.");
static int snd_cs4231_match(struct device *dev, unsigned int n) static int snd_cs4231_match(struct device *dev, unsigned int n)

Some files were not shown because too many files have changed in this diff Show more