diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-12 18:02:20 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-12 18:02:20 -0500 |
commit | 90ab5ee94171b3e28de6bb42ee30b527014e0be7 (patch) | |
tree | fcf89889f6e881f2b231d3d20287c08174ce4b54 /drivers/char | |
parent | 476bc0015bf09dad39d36a8b19f76f0c181d1ec9 (diff) |
module_param: make bool parameters really bool (drivers & misc)
module_param(bool) used to counter-intuitively take an int. In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.
It's time to remove the int/unsigned int option. For this version
it'll simply give a warning, but it'll break next kernel version.
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/agp/amd64-agp.c | 2 | ||||
-rw-r--r-- | drivers/char/agp/sis-agp.c | 2 | ||||
-rw-r--r-- | drivers/char/i8k.c | 8 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 2 | ||||
-rw-r--r-- | drivers/char/lp.c | 2 | ||||
-rw-r--r-- | drivers/char/nwflash.c | 2 | ||||
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 2 | ||||
-rw-r--r-- | drivers/char/random.c | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_tis.c | 6 |
9 files changed, 14 insertions, 14 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 780498d76581..444f8b6ab411 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #define ULI_X86_64_ENU_SCR_REG 0x54 | 33 | #define ULI_X86_64_ENU_SCR_REG 0x54 |
34 | 34 | ||
35 | static struct resource *aperture_resource; | 35 | static struct resource *aperture_resource; |
36 | static int __initdata agp_try_unsupported = 1; | 36 | static bool __initdata agp_try_unsupported = 1; |
37 | static int agp_bridges_found; | 37 | static int agp_bridges_found; |
38 | 38 | ||
39 | static void amd64_tlbflush(struct agp_memory *temp) | 39 | static void amd64_tlbflush(struct agp_memory *temp) |
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c index 29aacd81de78..08704ae53956 100644 --- a/drivers/char/agp/sis-agp.c +++ b/drivers/char/agp/sis-agp.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #define PCI_DEVICE_ID_SI_662 0x0662 | 17 | #define PCI_DEVICE_ID_SI_662 0x0662 |
18 | #define PCI_DEVICE_ID_SI_671 0x0671 | 18 | #define PCI_DEVICE_ID_SI_671 0x0671 |
19 | 19 | ||
20 | static int __devinitdata agp_sis_force_delay = 0; | 20 | static bool __devinitdata agp_sis_force_delay = 0; |
21 | static int __devinitdata agp_sis_agp_spec = -1; | 21 | static int __devinitdata agp_sis_agp_spec = -1; |
22 | 22 | ||
23 | static int sis_fetch_size(void) | 23 | static int sis_fetch_size(void) |
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index 6e40072fbf67..40cc0cf2ded6 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c | |||
@@ -69,19 +69,19 @@ MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)"); | |||
69 | MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops"); | 69 | MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops"); |
70 | MODULE_LICENSE("GPL"); | 70 | MODULE_LICENSE("GPL"); |
71 | 71 | ||
72 | static int force; | 72 | static bool force; |
73 | module_param(force, bool, 0); | 73 | module_param(force, bool, 0); |
74 | MODULE_PARM_DESC(force, "Force loading without checking for supported models"); | 74 | MODULE_PARM_DESC(force, "Force loading without checking for supported models"); |
75 | 75 | ||
76 | static int ignore_dmi; | 76 | static bool ignore_dmi; |
77 | module_param(ignore_dmi, bool, 0); | 77 | module_param(ignore_dmi, bool, 0); |
78 | MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match"); | 78 | MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match"); |
79 | 79 | ||
80 | static int restricted; | 80 | static bool restricted; |
81 | module_param(restricted, bool, 0); | 81 | module_param(restricted, bool, 0); |
82 | MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set"); | 82 | MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set"); |
83 | 83 | ||
84 | static int power_status; | 84 | static bool power_status; |
85 | module_param(power_status, bool, 0600); | 85 | module_param(power_status, bool, 0600); |
86 | MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k"); | 86 | MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k"); |
87 | 87 | ||
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 9397ab49b72e..50fcf9c04569 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -1227,7 +1227,7 @@ static int smi_num; /* Used to sequence the SMIs */ | |||
1227 | #define DEFAULT_REGSPACING 1 | 1227 | #define DEFAULT_REGSPACING 1 |
1228 | #define DEFAULT_REGSIZE 1 | 1228 | #define DEFAULT_REGSIZE 1 |
1229 | 1229 | ||
1230 | static int si_trydefaults = 1; | 1230 | static bool si_trydefaults = 1; |
1231 | static char *si_type[SI_MAX_PARMS]; | 1231 | static char *si_type[SI_MAX_PARMS]; |
1232 | #define MAX_SI_TYPE_STR 30 | 1232 | #define MAX_SI_TYPE_STR 30 |
1233 | static char si_type_str[MAX_SI_TYPE_STR]; | 1233 | static char si_type_str[MAX_SI_TYPE_STR]; |
diff --git a/drivers/char/lp.c b/drivers/char/lp.c index 97c3edb95ae7..f43485607063 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c | |||
@@ -829,7 +829,7 @@ static struct console lpcons = { | |||
829 | 829 | ||
830 | static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC }; | 830 | static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC }; |
831 | static char *parport[LP_NO]; | 831 | static char *parport[LP_NO]; |
832 | static int reset; | 832 | static bool reset; |
833 | 833 | ||
834 | module_param_array(parport, charp, NULL, 0); | 834 | module_param_array(parport, charp, NULL, 0); |
835 | module_param(reset, bool, 0); | 835 | module_param(reset, bool, 0); |
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c index a12f52400dbc..bf586ae1ee83 100644 --- a/drivers/char/nwflash.c +++ b/drivers/char/nwflash.c | |||
@@ -51,7 +51,7 @@ static int write_block(unsigned long p, const char __user *buf, int count); | |||
51 | #define KFLASH_ID 0x89A6 //Intel flash | 51 | #define KFLASH_ID 0x89A6 //Intel flash |
52 | #define KFLASH_ID4 0xB0D4 //Intel flash 4Meg | 52 | #define KFLASH_ID4 0xB0D4 //Intel flash 4Meg |
53 | 53 | ||
54 | static int flashdebug; //if set - we will display progress msgs | 54 | static bool flashdebug; //if set - we will display progress msgs |
55 | 55 | ||
56 | static int gbWriteEnable; | 56 | static int gbWriteEnable; |
57 | static int gbWriteBase64Enable; | 57 | static int gbWriteBase64Enable; |
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 15781396af25..07f6a5abe372 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -439,7 +439,7 @@ static int mgslpc_device_count = 0; | |||
439 | * .text section address and breakpoint on module load. | 439 | * .text section address and breakpoint on module load. |
440 | * This is useful for use with gdb and add-symbol-file command. | 440 | * This is useful for use with gdb and add-symbol-file command. |
441 | */ | 441 | */ |
442 | static int break_on_load=0; | 442 | static bool break_on_load=0; |
443 | 443 | ||
444 | /* | 444 | /* |
445 | * Driver major number, defaults to zero to get auto | 445 | * Driver major number, defaults to zero to get auto |
diff --git a/drivers/char/random.c b/drivers/char/random.c index 85da8740586b..732215b805c1 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -387,7 +387,7 @@ static DECLARE_WAIT_QUEUE_HEAD(random_write_wait); | |||
387 | static struct fasync_struct *fasync; | 387 | static struct fasync_struct *fasync; |
388 | 388 | ||
389 | #if 0 | 389 | #if 0 |
390 | static int debug; | 390 | static bool debug; |
391 | module_param(debug, bool, 0644); | 391 | module_param(debug, bool, 0644); |
392 | #define DEBUG_ENT(fmt, arg...) do { \ | 392 | #define DEBUG_ENT(fmt, arg...) do { \ |
393 | if (debug) \ | 393 | if (debug) \ |
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 10cc44ceb5d1..a1748621111b 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c | |||
@@ -255,7 +255,7 @@ out: | |||
255 | return size; | 255 | return size; |
256 | } | 256 | } |
257 | 257 | ||
258 | static int itpm; | 258 | static bool itpm; |
259 | module_param(itpm, bool, 0444); | 259 | module_param(itpm, bool, 0444); |
260 | MODULE_PARM_DESC(itpm, "Force iTPM workarounds (found on some Lenovo laptops)"); | 260 | MODULE_PARM_DESC(itpm, "Force iTPM workarounds (found on some Lenovo laptops)"); |
261 | 261 | ||
@@ -500,7 +500,7 @@ static irqreturn_t tis_int_handler(int dummy, void *dev_id) | |||
500 | return IRQ_HANDLED; | 500 | return IRQ_HANDLED; |
501 | } | 501 | } |
502 | 502 | ||
503 | static int interrupts = 1; | 503 | static bool interrupts = 1; |
504 | module_param(interrupts, bool, 0444); | 504 | module_param(interrupts, bool, 0444); |
505 | MODULE_PARM_DESC(interrupts, "Enable interrupts"); | 505 | MODULE_PARM_DESC(interrupts, "Enable interrupts"); |
506 | 506 | ||
@@ -828,7 +828,7 @@ static struct platform_driver tis_drv = { | |||
828 | 828 | ||
829 | static struct platform_device *pdev; | 829 | static struct platform_device *pdev; |
830 | 830 | ||
831 | static int force; | 831 | static bool force; |
832 | module_param(force, bool, 0444); | 832 | module_param(force, bool, 0444); |
833 | MODULE_PARM_DESC(force, "Force device probe rather than using ACPI entry"); | 833 | MODULE_PARM_DESC(force, "Force device probe rather than using ACPI entry"); |
834 | static int __init init_tis(void) | 834 | static int __init init_tis(void) |