Commit d8ad344c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pm' and 'acpi-video' 

* acpi-pm:
  ACPI / thermal: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / SBS: fix SBS driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / fan: fix fan driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / button: fix button driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / battery: fix battery driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / AC: fix AC driver compile error when CONFIG_PM_SLEEP is undefined

* acpi-video:
  Revert "ACPI: Blacklist Win8 OSI for some HP laptop 2013 models"
  ACPI / video: Add systems that should favour native backlight interface
  ACPI / video: Filter the _BCL table for duplicate brightness values
parents 200df1cc fae9e2a4 a6940190

drivers/acpi/ac.c

+2 −0
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ static int acpi_ac_resume(struct device *dev) 
		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

	return 0;

}

#else

#define acpi_ac_resume NULL

#endif

static SIMPLE_DEV_PM_OPS(acpi_ac_pm_ops, NULL, acpi_ac_resume);

drivers/acpi/battery.c

+2 −0
Original line number Diff line number Diff line
@@ -841,6 +841,8 @@ static int acpi_battery_resume(struct device *dev) 
	acpi_battery_update(battery);

	return 0;

}

#else

#define acpi_battery_resume NULL

#endif



static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);

drivers/acpi/blacklist.c

+0 −58
Original line number Diff line number Diff line
@@ -260,14 +260,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { 
	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "Dell Inspiron 15R SE",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		     DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7520"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "ThinkPad Edge E530",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
@@ -322,56 +314,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { 
		     DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP ProBook 2013 models",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP ProBook "),

		     DMI_MATCH(DMI_PRODUCT_NAME, " G1"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP EliteBook 2013 models",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook "),

		     DMI_MATCH(DMI_PRODUCT_NAME, " G1"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP ZBook 14",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 14"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP ZBook 15",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 15"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP ZBook 17",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 17"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP EliteBook 8780w",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8780w"),

		},

	},



	/*

	 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.

drivers/acpi/button.c

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event); 


#ifdef CONFIG_PM_SLEEP

static int acpi_button_resume(struct device *dev);

#else

#define acpi_button_resume NULL

#endif

static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);

drivers/acpi/fan.c

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ MODULE_DEVICE_TABLE(acpi, fan_device_ids); 
#ifdef CONFIG_PM_SLEEP

static int acpi_fan_suspend(struct device *dev);

static int acpi_fan_resume(struct device *dev);

#else

#define acpi_fan_suspend NULL

#define acpi_fan_resume NULL

#endif

static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume);

CRA Git | Maintained and supported by SUSTech CRA and CCSE