Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc45eb20 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPI / osi: Cleanup OSI handling code to use bool 



This patch changes "int/unsigned int" to "bool" to simplify the code.

Tested-by: default avatarLukas Wunner <lukas@wunner.de>
Tested-by: default avatarChen Yu <yu.c.chen@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e10cfdc3

drivers/acpi/blacklist.c

+2 −2
Original line number Diff line number Diff line
@@ -135,12 +135,12 @@ int __init acpi_blacklisted(void) 
#ifdef CONFIG_DMI

static int __init dmi_enable_osi_darwin(const struct dmi_system_id *d)

{

	acpi_dmi_osi_darwin(1, d);	/* enable */

	acpi_dmi_osi_darwin(true, d);	/* enable */

	return 0;

}

static int __init dmi_enable_osi_linux(const struct dmi_system_id *d)

{

	acpi_dmi_osi_linux(1, d);	/* enable */

	acpi_dmi_osi_linux(true, d);	/* enable */

	return 0;

}

static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)

drivers/acpi/osl.c

+13 −23
Original line number Diff line number Diff line
@@ -1785,11 +1785,9 @@ void __init acpi_osi_setup(char *str) 
	}

}



static void __init set_osi_darwin(unsigned int enable)

static void __init set_osi_darwin(bool enable)

{

	if (osi_config.darwin_enable != enable)

		osi_config.darwin_enable = enable;



	osi_config.darwin_enable = !!enable;

	if (enable) {

		acpi_osi_setup("!");

		acpi_osi_setup("Darwin");
@@ -1799,7 +1797,7 @@ static void __init set_osi_darwin(unsigned int enable) 
	}

}



static void __init acpi_cmdline_osi_darwin(unsigned int enable)

static void __init acpi_cmdline_osi_darwin(bool enable)

{

	/* cmdline set the default and override DMI */

	osi_config.darwin_cmdline = 1;
@@ -1809,13 +1807,10 @@ static void __init acpi_cmdline_osi_darwin(unsigned int enable) 
	return;

}



void __init acpi_dmi_osi_darwin(int enable, const struct dmi_system_id *d)

void __init acpi_dmi_osi_darwin(bool enable, const struct dmi_system_id *d)

{

	printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);



	if (enable == -1)

		return;



	/* DMI knows that this box asks OSI(Darwin) */

	osi_config.darwin_dmi = 1;

	set_osi_darwin(enable);
@@ -1823,12 +1818,10 @@ void __init acpi_dmi_osi_darwin(int enable, const struct dmi_system_id *d) 
	return;

}



static void __init set_osi_linux(unsigned int enable)

static void __init set_osi_linux(bool enable)

{

	if (osi_config.linux_enable != enable)

		osi_config.linux_enable = enable;



	if (osi_config.linux_enable)

	osi_config.linux_enable = !!enable;

	if (enable)

		acpi_osi_setup("Linux");

	else

		acpi_osi_setup("!Linux");
@@ -1836,7 +1829,7 @@ static void __init set_osi_linux(unsigned int enable) 
	return;

}



static void __init acpi_cmdline_osi_linux(unsigned int enable)

static void __init acpi_cmdline_osi_linux(bool enable)

{

	/* cmdline set the default and override DMI */

	osi_config.linux_cmdline = 1;
@@ -1846,13 +1839,10 @@ static void __init acpi_cmdline_osi_linux(unsigned int enable) 
	return;

}



void __init acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d)

void __init acpi_dmi_osi_linux(bool enable, const struct dmi_system_id *d)

{

	printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);



	if (enable == -1)

		return;



	/* DMI knows that this box asks OSI(Linux) */

	osi_config.linux_dmi = 1;

	set_osi_linux(enable);
@@ -1907,13 +1897,13 @@ static void __init acpi_osi_setup_late(void) 
static int __init osi_setup(char *str)

{

	if (str && !strcmp("Linux", str))

		acpi_cmdline_osi_linux(1);

		acpi_cmdline_osi_linux(true);

	else if (str && !strcmp("!Linux", str))

		acpi_cmdline_osi_linux(0);

		acpi_cmdline_osi_linux(false);

	else if (str && !strcmp("Darwin", str))

		acpi_cmdline_osi_darwin(1);

		acpi_cmdline_osi_darwin(true);

	else if (str && !strcmp("!Darwin", str))

		acpi_cmdline_osi_darwin(0);

		acpi_cmdline_osi_darwin(false);

	else

		acpi_osi_setup(str);

include/linux/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -359,8 +359,8 @@ extern bool wmi_has_guid(const char *guid); 
extern char acpi_video_backlight_string[];

extern long acpi_is_video_device(acpi_handle handle);

extern int acpi_blacklisted(void);

extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);

extern void acpi_dmi_osi_darwin(int enable, const struct dmi_system_id *d);

extern void acpi_dmi_osi_linux(bool enable, const struct dmi_system_id *d);

extern void acpi_dmi_osi_darwin(bool enable, const struct dmi_system_id *d);

extern void acpi_osi_setup(char *str);

extern bool acpi_osi_is_win8(void);