Commit 91da1a91 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] module_parm_array fixups

Fix up various things which Rusty's patch broke or missed.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c98de39f
...@@ -51,12 +51,12 @@ MODULE_PARM_DESC(latency,"pci latency timer"); ...@@ -51,12 +51,12 @@ MODULE_PARM_DESC(latency,"pci latency timer");
static unsigned int tuner[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int tuner[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
static int tuner_num; 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"); MODULE_PARM_DESC(tuner,"tuner type");
static unsigned int card[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int card[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
static int card_num; 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"); MODULE_PARM_DESC(card,"card type");
static unsigned int nicam = 0; static unsigned int nicam = 0;
......
...@@ -42,17 +42,17 @@ MODULE_LICENSE("GPL"); ...@@ -42,17 +42,17 @@ MODULE_LICENSE("GPL");
static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
static unsigned int video_nr_num; 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"); MODULE_PARM_DESC(video_nr,"video device numbers");
static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
static unsigned int vbi_nr_num; 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"); MODULE_PARM_DESC(vbi_nr,"vbi device numbers");
static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
static unsigned int radio_nr_num; 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"); MODULE_PARM_DESC(radio_nr,"radio device numbers");
static unsigned int video_debug = 0; static unsigned int video_debug = 0;
......
...@@ -375,10 +375,10 @@ MODULE_PARM_DESC(file, "names of backing files or devices"); ...@@ -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_param_array(ro, bool, &mod_data.num_ros, S_IRUGO);
MODULE_PARM_DESC(ro, "true to force read-only"); 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_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"); MODULE_PARM_DESC(removable, "true to simulate removable media");
......
...@@ -183,7 +183,7 @@ MODULE_PARM_DESC(force_palette, "Force the palette to a specific value"); ...@@ -183,7 +183,7 @@ MODULE_PARM_DESC(force_palette, "Force the palette to a specific value");
module_param(backlight, int, 0); module_param(backlight, int, 0);
MODULE_PARM_DESC(backlight, "For objects that are lit from behind"); MODULE_PARM_DESC(backlight, "For objects that are lit from behind");
static int num_uv; 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, MODULE_PARM_DESC(unit_video,
"Force use of specific minor number(s). 0 is not allowed."); "Force use of specific minor number(s). 0 is not allowed.");
module_param(remove_zeros, int, 0); module_param(remove_zeros, int, 0);
......
...@@ -69,13 +69,13 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card ...@@ -69,13 +69,13 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card
static char *model[SNDRV_CARDS]; static char *model[SNDRV_CARDS];
static int boot_devs; 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_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_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_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."); MODULE_PARM_DESC(model, "Use the given board model.");
#ifndef PCI_VENDOR_ID_ICE #ifndef PCI_VENDOR_ID_ICE
......
...@@ -58,11 +58,11 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ ...@@ -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 enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
static int boot_devs; 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_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_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."); MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard.");
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment