[PATCH] module_parm_array fixups

Fix up various things which Rusty's patch broke or missed.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 6ad8c10373ada1068b17eb914cb7d5689408d591..69975fd4ea595d64f435b22603c82b8568a0e8f5 100644 (file)
--- 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 1ee7e4484c7e9d3ecfda6a906bfe5a40ea72963a..78ad9e61168743efb0fa9a6e2974e923af7d7e0c 100644 (file)
--- 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 1fe4a6fca50c6b6cda88f24550848efd35435d2b..4b830252a9747738e95fa442dd04198932656f24 100644 (file)
--- 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 7de03331289e2a56dd872079fe180efb75721926..a8437c2919bc352b3bfeafa9f54944bbcd379456 100644 (file)
--- 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 b3b63219408d71a14129699a42fafd3e6ca96d2d..f273298fa311ade0c6fbc062e0998de0f23cb9ae 100644 (file)
--- 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 a282795c3341da2bd0790e0641eaa707dfbedf87..c341a24c45f39cf7084fa51e68a6c0c6d5752acd 100644 (file)
--- 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.");
 
 /*