From 91da1a91e58a651ea8492ab4396efacc2c2812f8 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 19 Oct 2004 18:22:51 -0700 Subject: [PATCH] [PATCH] module_parm_array fixups Fix up various things which Rusty's patch broke or missed. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/media/video/cx88/cx88-core.c | 4 ++-- drivers/media/video/cx88/cx88-video.c | 6 +++--- drivers/usb/gadget/file_storage.c | 4 ++-- drivers/usb/media/ov511.c | 2 +- sound/pci/ice1712/ice1724.c | 8 ++++---- sound/pci/rme96.c | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index 6ad8c10373ada..69975fd4ea595 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c @@ -51,12 +51,12 @@ MODULE_PARM_DESC(latency,"pci latency timer"); static unsigned int tuner[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static int tuner_num; -module_param_array(tuner,int,tuner_num,0444); +module_param_array(tuner,int,&tuner_num,0444); MODULE_PARM_DESC(tuner,"tuner type"); static unsigned int card[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static int card_num; -module_param_array(card,int,card_num,0444); +module_param_array(card,int,&card_num,0444); MODULE_PARM_DESC(card,"card type"); static unsigned int nicam = 0; diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 1ee7e4484c7e9..78ad9e6116874 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c @@ -42,17 +42,17 @@ MODULE_LICENSE("GPL"); static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int video_nr_num; -module_param_array(video_nr,int,video_nr_num,0444); +module_param_array(video_nr,int,&video_nr_num,0444); MODULE_PARM_DESC(video_nr,"video device numbers"); static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int vbi_nr_num; -module_param_array(vbi_nr,int,vbi_nr_num,0444); +module_param_array(vbi_nr,int,&vbi_nr_num,0444); MODULE_PARM_DESC(vbi_nr,"vbi device numbers"); static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int radio_nr_num; -module_param_array(radio_nr,int,radio_nr_num,0444); +module_param_array(radio_nr,int,&radio_nr_num,0444); MODULE_PARM_DESC(radio_nr,"radio device numbers"); static unsigned int video_debug = 0; diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index 1fe4a6fca50c6..4b830252a9747 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c @@ -375,10 +375,10 @@ MODULE_PARM_DESC(file, "names of backing files or devices"); module_param_array(ro, bool, &mod_data.num_ros, S_IRUGO); MODULE_PARM_DESC(ro, "true to force read-only"); -module_param_named(luns, &mod_data.nluns, uint, S_IRUGO); +module_param_named(luns, mod_data.nluns, uint, S_IRUGO); MODULE_PARM_DESC(luns, "number of LUNs"); -module_param_named(removable, &mod_data.removable, bool, S_IRUGO); +module_param_named(removable, mod_data.removable, bool, S_IRUGO); MODULE_PARM_DESC(removable, "true to simulate removable media"); diff --git a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c index 7de03331289e2..a8437c2919bc3 100644 --- a/drivers/usb/media/ov511.c +++ b/drivers/usb/media/ov511.c @@ -183,7 +183,7 @@ MODULE_PARM_DESC(force_palette, "Force the palette to a specific value"); module_param(backlight, int, 0); MODULE_PARM_DESC(backlight, "For objects that are lit from behind"); static int num_uv; -module_param_array(unit_video, int, num_uv, 0); +module_param_array(unit_video, int, &num_uv, 0); MODULE_PARM_DESC(unit_video, "Force use of specific minor number(s). 0 is not allowed."); module_param(remove_zeros, int, 0); diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index b3b63219408d7..f273298fa311a 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -69,13 +69,13 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card static char *model[SNDRV_CARDS]; static int boot_devs; -module_param_array(index, int, boot_devs, 0444); +module_param_array(index, int, &boot_devs, 0444); MODULE_PARM_DESC(index, "Index value for ICE1724 soundcard."); -module_param_array(id, charp, boot_devs, 0444); +module_param_array(id, charp, &boot_devs, 0444); MODULE_PARM_DESC(id, "ID string for ICE1724 soundcard."); -module_param_array(enable, bool, boot_devs, 0444); +module_param_array(enable, bool, &boot_devs, 0444); MODULE_PARM_DESC(enable, "Enable ICE1724 soundcard."); -module_param_array(model, charp, boot_devs, 0444); +module_param_array(model, charp, &boot_devs, 0444); MODULE_PARM_DESC(model, "Use the given board model."); #ifndef PCI_VENDOR_ID_ICE diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index a282795c3341d..c341a24c45f39 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c @@ -58,11 +58,11 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ static int boot_devs; -module_param_array(index, int, boot_devs, 0444); +module_param_array(index, int, &boot_devs, 0444); MODULE_PARM_DESC(index, "Index value for RME Digi96 soundcard."); -module_param_array(id, charp, boot_devs, 0444); +module_param_array(id, charp, &boot_devs, 0444); MODULE_PARM_DESC(id, "ID string for RME Digi96 soundcard."); -module_param_array(enable, bool, boot_devs, 0444); +module_param_array(enable, bool, &boot_devs, 0444); MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard."); /* -- 2.53.0