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

Merge branches 'acpi-video', 'acpi-battery' and 'acpi-cppc' 

* acpi-video:
  ACPI / video: Use true for boolean value

* acpi-battery:
  ACPI / battery: Add quirk for Asus UX360UA and UX410UAK

* acpi-cppc:
  ACPI / CPPC: Use 64-bit arithmetic instead of 32-bit
parents 3c9c75de 97e45dd6 4446823e b52f4511

drivers/acpi/acpi_video.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ MODULE_AUTHOR("Bruno Ducrot"); 
MODULE_DESCRIPTION("ACPI Video Driver");

MODULE_LICENSE("GPL");



static bool brightness_switch_enabled = 1;

static bool brightness_switch_enabled = true;

module_param(brightness_switch_enabled, bool, 0644);



/*

drivers/acpi/battery.c

+16 −0
Original line number Diff line number Diff line
@@ -1209,6 +1209,22 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "UX305LA"),

		},

	},

	{

		.callback = battery_full_discharging_quirk,

		.ident = "ASUS UX360UA",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "UX360UA"),

		},

	},

	{

		.callback = battery_full_discharging_quirk,

		.ident = "ASUS UX410UAK",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "UX410UAK"),

		},

	},

	{},

};

drivers/acpi/cppc_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static DEFINE_PER_CPU(struct cpc_desc *, cpc_desc_ptr); 
 * to PCC commands. Keeping it high enough to cover emulators where

 * the processors run painfully slow.

 */

#define NUM_RETRIES 500

#define NUM_RETRIES 500ULL



struct cppc_attr {

	struct attribute attr;