Skip to content

Commit 45eaf2e

Browse files
committed
platform/x86: int3472: discrete: Use FIELD_GET() on the GPIO _DSM return value
Add defines for the various fields encoded in the GPIO _DSM integer return value and then use FIELD_GET() to get field values. Suggested-by: Ilpo Järvinen <[email protected]> Reviewed-by: Ilpo Järvinen <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ebeb3ff commit 45eaf2e

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/platform/x86/intel/int3472/discrete.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/* Author: Dan Scally <[email protected]> */
33

44
#include <linux/acpi.h>
5+
#include <linux/bitfield.h>
56
#include <linux/device.h>
67
#include <linux/gpio/consumer.h>
78
#include <linux/gpio/machine.h>
@@ -25,6 +26,10 @@ static const guid_t int3472_gpio_guid =
2526
GUID_INIT(0x79234640, 0x9e10, 0x4fea,
2627
0xa5, 0xc1, 0xb5, 0xaa, 0x8b, 0x19, 0x75, 0x6f);
2728

29+
#define INT3472_GPIO_DSM_TYPE GENMASK(7, 0)
30+
#define INT3472_GPIO_DSM_PIN GENMASK(15, 8)
31+
#define INT3472_GPIO_DSM_SENSOR_ON_VAL GENMASK(31, 24)
32+
2833
/*
2934
* 822ace8f-2814-4174-a56b-5f029fe079ee
3035
* This _DSM GUID returns a string from the sensor device, which acts as a
@@ -174,12 +179,11 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
174179
return 1;
175180
}
176181

177-
type = obj->integer.value & 0xff;
182+
type = FIELD_GET(INT3472_GPIO_DSM_TYPE, obj->integer.value);
178183

179184
int3472_get_func_and_polarity(type, &func, &polarity);
180185

181-
/* If bits 31-24 of the _DSM entry are all 0 then the signal is inverted */
182-
active_value = obj->integer.value >> 24;
186+
active_value = FIELD_GET(INT3472_GPIO_DSM_SENSOR_ON_VAL, obj->integer.value);
183187
if (!active_value)
184188
polarity ^= GPIO_ACTIVE_LOW;
185189

0 commit comments

Comments
 (0)