Commit f68080f8 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown
Browse files

ACPI: thinkpad-acpi: module glue cleanups 



General cleanup of module glue: Do some code reordering, and add
missing parameter help text.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4b45cc07

drivers/misc/thinkpad_acpi.c

+50 −33
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ enum { 
 * Main driver

 */



/* Module */

#define IBM_NAME "thinkpad"

#define IBM_DESC "ThinkPad ACPI Extras"

#define IBM_FILE IBM_NAME "_acpi"
@@ -138,37 +137,6 @@ enum { 


#define IBM_MAX_ACPI_ARGS 3



MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");

MODULE_DESCRIPTION(IBM_DESC);

MODULE_VERSION(IBM_VERSION);

MODULE_LICENSE("GPL");



/* Please remove this in year 2009 */

MODULE_ALIAS("ibm_acpi");



/*

 * DMI matching for module autoloading

 *

 * See http://thinkwiki.org/wiki/List_of_DMI_IDs

 * See http://thinkwiki.org/wiki/BIOS_Upgrade_Downloads

 *

 * Only models listed in thinkwiki will be supported, so add yours

 * if it is not there yet.

 */

#define IBM_BIOS_MODULE_ALIAS(__type) \

	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")



/* Non-ancient thinkpads */

MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");

MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");



/* Ancient thinkpad BIOSes have to be identified by

 * BIOS type or model number, and there are far less

 * BIOS types than model numbers... */

IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]");

IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");

IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");



/* Debugging */

#define IBM_LOG IBM_FILE ": "

#define IBM_ERR	   KERN_ERR    IBM_LOG
@@ -5734,21 +5702,39 @@ static int __init set_ibm_param(const char *val, struct kernel_param *kp) 
}



module_param(experimental, int, 0);

MODULE_PARM_DESC(experimental,

                 "Enables experimental features when non-zero");



module_param_named(debug, dbg_level, uint, 0);

MODULE_PARM_DESC(debug, "Sets debug level bit-mask");



module_param(force_load, bool, 0);

MODULE_PARM_DESC(force_load,

                 "Attempts to load the driver even on a "

                 "mis-identified ThinkPad when true");



module_param_named(fan_control, fan_control_allowed, bool, 0);

MODULE_PARM_DESC(fan_control,

                 "Enables setting fan parameters features when true");



module_param_named(brightness_mode, brightness_mode, int, 0);

MODULE_PARM_DESC(brightness_mode,

                 "Selects brightness control strategy: "

                 "0=auto, 1=EC, 2=CMOS, 3=both");



module_param(brightness_enable, uint, 0);

MODULE_PARM_DESC(brightness_enable,

                 "Enables backlight control when 1, disables when 0");



module_param(hotkey_report_mode, uint, 0);

MODULE_PARM_DESC(hotkey_report_mode,

                 "used for backwards compatibility with userspace, "

                 "see documentation");



#define IBM_PARAM(feature) \

	module_param_call(feature, set_ibm_param, NULL, NULL, 0)

	module_param_call(feature, set_ibm_param, NULL, NULL, 0); \

	MODULE_PARM_DESC(feature, "Simulates thinkpad-aci procfs command " \

	                 "at module load, see documentation")



IBM_PARAM(hotkey);

IBM_PARAM(bluetooth);
@@ -5957,5 +5943,36 @@ static int __init thinkpad_acpi_module_init(void) 
	return 0;

}



/* Please remove this in year 2009 */

MODULE_ALIAS("ibm_acpi");



/*

 * DMI matching for module autoloading

 *

 * See http://thinkwiki.org/wiki/List_of_DMI_IDs

 * See http://thinkwiki.org/wiki/BIOS_Upgrade_Downloads

 *

 * Only models listed in thinkwiki will be supported, so add yours

 * if it is not there yet.

 */

#define IBM_BIOS_MODULE_ALIAS(__type) \

	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")



/* Non-ancient thinkpads */

MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");

MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");



/* Ancient thinkpad BIOSes have to be identified by

 * BIOS type or model number, and there are far less

 * BIOS types than model numbers... */

IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]");

IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");

IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");



MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");

MODULE_DESCRIPTION(IBM_DESC);

MODULE_VERSION(IBM_VERSION);

MODULE_LICENSE("GPL");



module_init(thinkpad_acpi_module_init);

module_exit(thinkpad_acpi_module_exit);