Commit 55335259 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These fix the ACPI EC and AC drivers, the ACPI APEI error injection
  driver and build issues related to the dev_is_pnp() macro referring to
  pnp_bus_type that is not exported to modules.

  Specifics:

   - Fix error handling during EC operation region accesses in the ACPI
     EC driver (Armin Wolf)

   - Fix a memory leak in the APEI error injection driver introduced
     during its converion to a platform driver (Dan Williams)

   - Fix build failures related to the dev_is_pnp() macro by redefining
     it as a proper function and exporting it to modules as appropriate
     and unexport pnp_bus_type which need not be exported any more (Andy
     Shevchenko)

   - Update the ACPI AC driver to use power_supply_changed() to let the
     power supply core handle configuration changes properly (Thomas
     Weißschuh)"

* tag 'acpi-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: AC: Properly notify powermanagement core about changes
  PNP: Hide pnp_bus_type from the non-PNP code
  PNP: Make dev_is_pnp() to be a function and export it for modules
  ACPI: EC: Avoid returning AE_OK on errors in address space handler
  ACPI: EC: Abort address space access upon error
  ACPI: APEI: EINJ: Fix einj_dev release leak
parents 64c6a36d 1bfc0835

drivers/acpi/ac.c

+2 −2
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) 
						  dev_name(&adev->dev), event,

						  (u32) ac->state);

		acpi_notifier_call_chain(adev, event, (u32) ac->state);

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

		power_supply_changed(ac->charger);

	}

}
@@ -268,7 +268,7 @@ static int acpi_ac_resume(struct device *dev) 
	if (acpi_ac_get_state(ac))

		return 0;

	if (old_state != ac->state)

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

		power_supply_changed(ac->charger);



	return 0;

}

drivers/acpi/apei/einj-core.c

+1 −1
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ static void __exit einj_exit(void) 
	if (einj_initialized)

		platform_driver_unregister(&einj_driver);



	platform_device_del(einj_dev);

	platform_device_unregister(einj_dev);

}



module_init(einj_init);

drivers/acpi/ec.c

+7 −2
Original line number Diff line number Diff line
@@ -1333,10 +1333,13 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, 
	if (ec->busy_polling || bits > 8)

		acpi_ec_burst_enable(ec);



	for (i = 0; i < bytes; ++i, ++address, ++value)

	for (i = 0; i < bytes; ++i, ++address, ++value) {

		result = (function == ACPI_READ) ?

			acpi_ec_read(ec, address, value) :

			acpi_ec_write(ec, address, *value);

		if (result < 0)

			break;

	}



	if (ec->busy_polling || bits > 8)

		acpi_ec_burst_disable(ec);
@@ -1348,8 +1351,10 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, 
		return AE_NOT_FOUND;

	case -ETIME:

		return AE_TIME;

	default:

	case 0:

		return AE_OK;

	default:

		return AE_ERROR;

	}

}

drivers/acpi/sbs.c

+2 −2
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static void acpi_sbs_callback(void *context) 
	if (sbs->charger_exists) {

		acpi_ac_get_present(sbs);

		if (sbs->charger_present != saved_charger_state)

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

			power_supply_changed(sbs->charger);

	}



	if (sbs->manager_present) {
@@ -622,7 +622,7 @@ static void acpi_sbs_callback(void *context) 
			acpi_battery_read(bat);

			if (saved_battery_state == bat->present)

				continue;

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

			power_supply_changed(bat->bat);

		}

	}

}

drivers/pnp/base.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


extern struct mutex pnp_lock;

extern const struct attribute_group *pnp_dev_groups[];

extern const struct bus_type pnp_bus_type;



int pnp_register_protocol(struct pnp_protocol *protocol);

void pnp_unregister_protocol(struct pnp_protocol *protocol);