diff options
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/cmi8328.c | 4 | ||||
-rw-r--r-- | sound/isa/msnd/msnd_pinnacle.c | 32 | ||||
-rw-r--r-- | sound/isa/sc6000.c | 4 |
3 files changed, 20 insertions, 20 deletions
diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c index d09e456107ad..de6ef1b1cf0e 100644 --- a/sound/isa/cmi8328.c +++ b/sound/isa/cmi8328.c @@ -192,7 +192,7 @@ static int snd_cmi8328_mixer(struct snd_wss *chip) } /* find index of an item in "-1"-ended array */ -int array_find(int array[], int item) +static int array_find(int array[], int item) { int i; @@ -203,7 +203,7 @@ int array_find(int array[], int item) return -1; } /* the same for long */ -int array_find_l(long array[], long item) +static int array_find_l(long array[], long item) { int i; diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index 45e561c425bf..6c584d9b6c42 100644 --- a/sound/isa/msnd/msnd_pinnacle.c +++ b/sound/isa/msnd/msnd_pinnacle.c @@ -757,9 +757,9 @@ static int snd_msnd_pinnacle_cfg_reset(int cfg) static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ -module_param_array(index, int, NULL, S_IRUGO); +module_param_array(index, int, NULL, 0444); MODULE_PARM_DESC(index, "Index value for msnd_pinnacle soundcard."); -module_param_array(id, charp, NULL, S_IRUGO); +module_param_array(id, charp, NULL, 0444); MODULE_PARM_DESC(id, "ID string for msnd_pinnacle soundcard."); static long io[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; @@ -801,22 +801,22 @@ MODULE_LICENSE("GPL"); MODULE_FIRMWARE(INITCODEFILE); MODULE_FIRMWARE(PERMCODEFILE); -module_param_hw_array(io, long, ioport, NULL, S_IRUGO); +module_param_hw_array(io, long, ioport, NULL, 0444); MODULE_PARM_DESC(io, "IO port #"); -module_param_hw_array(irq, int, irq, NULL, S_IRUGO); -module_param_hw_array(mem, long, iomem, NULL, S_IRUGO); -module_param_array(write_ndelay, int, NULL, S_IRUGO); -module_param(calibrate_signal, int, S_IRUGO); +module_param_hw_array(irq, int, irq, NULL, 0444); +module_param_hw_array(mem, long, iomem, NULL, 0444); +module_param_array(write_ndelay, int, NULL, 0444); +module_param(calibrate_signal, int, 0444); #ifndef MSND_CLASSIC -module_param_array(digital, int, NULL, S_IRUGO); -module_param_hw_array(cfg, long, ioport, NULL, S_IRUGO); -module_param_array(reset, int, 0, S_IRUGO); -module_param_hw_array(mpu_io, long, ioport, NULL, S_IRUGO); -module_param_hw_array(mpu_irq, int, irq, NULL, S_IRUGO); -module_param_hw_array(ide_io0, long, ioport, NULL, S_IRUGO); -module_param_hw_array(ide_io1, long, ioport, NULL, S_IRUGO); -module_param_hw_array(ide_irq, int, irq, NULL, S_IRUGO); -module_param_hw_array(joystick_io, long, ioport, NULL, S_IRUGO); +module_param_array(digital, int, NULL, 0444); +module_param_hw_array(cfg, long, ioport, NULL, 0444); +module_param_array(reset, int, 0, 0444); +module_param_hw_array(mpu_io, long, ioport, NULL, 0444); +module_param_hw_array(mpu_irq, int, irq, NULL, 0444); +module_param_hw_array(ide_io0, long, ioport, NULL, 0444); +module_param_hw_array(ide_io1, long, ioport, NULL, 0444); +module_param_hw_array(ide_irq, int, irq, NULL, 0444); +module_param_hw_array(joystick_io, long, ioport, NULL, 0444); #endif diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index c09d9b914efe..a985e9183be9 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c @@ -592,7 +592,7 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev) *vport = devm_ioport_map(devptr, port[dev], 0x10); if (*vport == NULL) { snd_printk(KERN_ERR PFX - "I/O port cannot be iomaped.\n"); + "I/O port cannot be iomapped.\n"); err = -EBUSY; goto err_unmap1; } @@ -607,7 +607,7 @@ static int snd_sc6000_probe(struct device *devptr, unsigned int dev) vmss_port = devm_ioport_map(devptr, mss_port[dev], 4); if (!vmss_port) { snd_printk(KERN_ERR PFX - "MSS port I/O cannot be iomaped.\n"); + "MSS port I/O cannot be iomapped.\n"); err = -EBUSY; goto err_unmap2; } |