aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2013-07-13 17:27:26 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-07-22 22:00:27 -0400
commit1ad3790ac7cfac699993a3f2e189a69a82f8fe4d (patch)
tree223cc6048a3ef16c2c90e752e4c636e05be07680 /drivers/pci
parentc38f82cf1b7dc8aad2bce8e30113fd6aa3159dab (diff)
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: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index e2e5e3088816..d8748a4a18a7 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -1107,11 +1107,7 @@ u8 acpiphp_get_power_status(struct acpiphp_slot *slot)
1107 */ 1107 */
1108u8 acpiphp_get_latch_status(struct acpiphp_slot *slot) 1108u8 acpiphp_get_latch_status(struct acpiphp_slot *slot)
1109{ 1109{
1110 unsigned int sta; 1110 return !(get_slot_status(slot) & ACPI_STA_DEVICE_UI);
1111
1112 sta = get_slot_status(slot);
1113
1114 return (sta & ACPI_STA_DEVICE_UI) ? 0 : 1;
1115} 1111}
1116 1112
1117 1113
@@ -1121,9 +1117,5 @@ u8 acpiphp_get_latch_status(struct acpiphp_slot *slot)
1121 */ 1117 */
1122u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot) 1118u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot)
1123{ 1119{
1124 unsigned int sta; 1120 return !!get_slot_status(slot);
1125
1126 sta = get_slot_status(slot);
1127
1128 return (sta == 0) ? 0 : 1;
1129} 1121}