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

Commit 1ad3790a authored by Mika Westerberg's avatar Mika Westerberg Committed by Rafael J. Wysocki
Browse files

ACPI / hotplug / PCI: Sanitize acpiphp_get_(latch)|(adapter)_status() 



There is no need for a temporary variable and all the tricks with
ternary operators in acpiphp_get_(latch)|(adapter)_status(). Change
those functions to be a bit more straightforward.

[rjw: Changelog]
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c38f82cf

drivers/pci/hotplug/acpiphp_glue.c

+2 −10
Original line number Diff line number Diff line
@@ -1107,11 +1107,7 @@ u8 acpiphp_get_power_status(struct acpiphp_slot *slot) 
 */

u8 acpiphp_get_latch_status(struct acpiphp_slot *slot)

{

	unsigned int sta;



	sta = get_slot_status(slot);



	return (sta & ACPI_STA_DEVICE_UI) ? 0 : 1;

	return !(get_slot_status(slot) & ACPI_STA_DEVICE_UI);

}
@@ -1121,9 +1117,5 @@ u8 acpiphp_get_latch_status(struct acpiphp_slot *slot) 
 */

u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot)

{

	unsigned int sta;



	sta = get_slot_status(slot);



	return (sta == 0) ? 0 : 1;

	return !!get_slot_status(slot);

}