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

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

Merge ACPI battery and backlight driver update and miscellaneous
cleanup for 5.19-rc1:

 - Make the ACPI battery driver show the "not-charging" status by
   default unless "charging" or "full" is directly indicated (Werner
   Sembach).

 - Improve the PM notifier in the ACPI backlight driver (Zhang Rui).

 - Clean up some white space in the ACPI code (Ian Cowan).

* acpi-battery:
  ACPI: battery: Make "not-charging" the default on no charging or full info

* acpi-video:
  ACPI: video: improve PM notifer callback

* acpi-misc:
  ACPI: clean up white space in a few places for consistency
parents 15f4bb9a 185d2069 1934fee6 4c19851c

drivers/acpi/ac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ MODULE_AUTHOR("Paul Diefenbaugh"); 
MODULE_DESCRIPTION("ACPI AC Adapter Driver");

MODULE_DESCRIPTION("ACPI AC Adapter Driver");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");







static int acpi_ac_add(struct acpi_device *device);

static int acpi_ac_add(struct acpi_device *device);

static int acpi_ac_remove(struct acpi_device *device);

static int acpi_ac_remove(struct acpi_device *device);

static void acpi_ac_notify(struct acpi_device *device, u32 event);

static void acpi_ac_notify(struct acpi_device *device, u32 event);
@@ -125,6 +124,7 @@ static int get_ac_property(struct power_supply *psy, 
	default:

	default:

		return -EINVAL;

		return -EINVAL;

	}

	}



	return 0;

	return 0;

}

}
@@ -286,6 +286,7 @@ static int acpi_ac_resume(struct device *dev) 
		return 0;

		return 0;

	if (old_state != ac->state)

	if (old_state != ac->state)

		kobject_uevent(&ac->charger->dev.kobj, KOBJ_CHANGE);

		kobject_uevent(&ac->charger->dev.kobj, KOBJ_CHANGE);



	return 0;

	return 0;

}

}

#else

#else
@@ -296,7 +297,6 @@ static int acpi_ac_remove(struct acpi_device *device) 
{

{

	struct acpi_ac *ac = NULL;

	struct acpi_ac *ac = NULL;







	if (!device || !acpi_driver_data(device))

	if (!device || !acpi_driver_data(device))

		return -EINVAL;

		return -EINVAL;

drivers/acpi/acpi_video.c

+15 −16
Original line number Original line Diff line number Diff line
@@ -1707,12 +1707,9 @@ static int acpi_video_resume(struct notifier_block *nb, 
	int i;

	int i;





	switch (val) {

	switch (val) {

	case PM_HIBERNATION_PREPARE:

	case PM_POST_HIBERNATION:

	case PM_SUSPEND_PREPARE:

	case PM_POST_SUSPEND:

	case PM_RESTORE_PREPARE:

	case PM_POST_RESTORE:

		return NOTIFY_DONE;

	}



		video = container_of(nb, struct acpi_video_bus, pm_nb);

		video = container_of(nb, struct acpi_video_bus, pm_nb);





		dev_info(&video->device->dev, "Restoring backlight state\n");

		dev_info(&video->device->dev, "Restoring backlight state\n");
@@ -1726,6 +1723,8 @@ static int acpi_video_resume(struct notifier_block *nb, 




		return NOTIFY_OK;

		return NOTIFY_OK;

	}

	}

	return NOTIFY_DONE;

}





static acpi_status

static acpi_status

acpi_video_bus_match(acpi_handle handle, u32 level, void *context,

acpi_video_bus_match(acpi_handle handle, u32 level, void *context,

drivers/acpi/battery.c

+1 −23
Original line number Original line Diff line number Diff line
@@ -52,7 +52,6 @@ static bool battery_driver_registered; 
static int battery_bix_broken_package;

static int battery_bix_broken_package;

static int battery_notification_delay_ms;

static int battery_notification_delay_ms;

static int battery_ac_is_broken;

static int battery_ac_is_broken;

static int battery_quirk_notcharging;

static unsigned int cache_time = 1000;

static unsigned int cache_time = 1000;

module_param(cache_time, uint, 0644);

module_param(cache_time, uint, 0644);

MODULE_PARM_DESC(cache_time, "cache time in milliseconds");

MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -216,10 +215,8 @@ static int acpi_battery_get_property(struct power_supply *psy, 
			val->intval = POWER_SUPPLY_STATUS_CHARGING;

			val->intval = POWER_SUPPLY_STATUS_CHARGING;

		else if (acpi_battery_is_charged(battery))

		else if (acpi_battery_is_charged(battery))

			val->intval = POWER_SUPPLY_STATUS_FULL;

			val->intval = POWER_SUPPLY_STATUS_FULL;

		else if (battery_quirk_notcharging)

			val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;

		else

		else

			val->intval = POWER_SUPPLY_STATUS_UNKNOWN;

			val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;

		break;

		break;

	case POWER_SUPPLY_PROP_PRESENT:

	case POWER_SUPPLY_PROP_PRESENT:

		val->intval = acpi_battery_present(battery);

		val->intval = acpi_battery_present(battery);
@@ -1105,12 +1102,6 @@ battery_ac_is_broken_quirk(const struct dmi_system_id *d) 
	return 0;

	return 0;

}

}





static int __init battery_quirk_not_charging(const struct dmi_system_id *d)

{

	battery_quirk_notcharging = 1;

	return 0;

}



static const struct dmi_system_id bat_dmi_table[] __initconst = {

static const struct dmi_system_id bat_dmi_table[] __initconst = {

	{

	{

		/* NEC LZ750/LS */

		/* NEC LZ750/LS */
@@ -1139,19 +1130,6 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_BIOS_DATE, "08/22/2014"),

			DMI_MATCH(DMI_BIOS_DATE, "08/22/2014"),

		},

		},

	},

	},

	{

		/*

		 * On Lenovo ThinkPads the BIOS specification defines

		 * a state when the bits for charging and discharging

		 * are both set to 0. That state is "Not Charging".

		 */

		.callback = battery_quirk_not_charging,

		.ident = "Lenovo ThinkPad",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),

		},

	},

	{

	{

		/* Microsoft Surface Go 3 */

		/* Microsoft Surface Go 3 */

		.callback = battery_notification_delay_quirk,

		.callback = battery_notification_delay_quirk,