diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2023-06-16 19:21:31 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-06-20 12:39:34 +0200 |
| commit | 45eaf2e2b8bc9bf4beaa30918a25690ae105a913 (patch) | |
| tree | 87ed127e88b2634035dff89a9a9b87de6ce2c523 /drivers/platform/x86/intel/int3472 | |
| parent | ebeb3fff9cd197a8890733e0af4eb06d8114cdff (diff) | |
| download | linux-45eaf2e2b8bc9bf4beaa30918a25690ae105a913.tar.gz linux-45eaf2e2b8bc9bf4beaa30918a25690ae105a913.tar.bz2 linux-45eaf2e2b8bc9bf4beaa30918a25690ae105a913.zip | |
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 <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230616172132.37859-6-hdegoede@redhat.com
Diffstat (limited to 'drivers/platform/x86/intel/int3472')
| -rw-r--r-- | drivers/platform/x86/intel/int3472/discrete.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c index 3b410428cec2..557517f43ede 100644 --- a/drivers/platform/x86/intel/int3472/discrete.c +++ b/drivers/platform/x86/intel/int3472/discrete.c @@ -2,6 +2,7 @@ /* Author: Dan Scally <djrscally@gmail.com> */ #include <linux/acpi.h> +#include <linux/bitfield.h> #include <linux/device.h> #include <linux/gpio/consumer.h> #include <linux/gpio/machine.h> @@ -25,6 +26,10 @@ static const guid_t int3472_gpio_guid = GUID_INIT(0x79234640, 0x9e10, 0x4fea, 0xa5, 0xc1, 0xb5, 0xaa, 0x8b, 0x19, 0x75, 0x6f); +#define INT3472_GPIO_DSM_TYPE GENMASK(7, 0) +#define INT3472_GPIO_DSM_PIN GENMASK(15, 8) +#define INT3472_GPIO_DSM_SENSOR_ON_VAL GENMASK(31, 24) + /* * 822ace8f-2814-4174-a56b-5f029fe079ee * 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, return 1; } - type = obj->integer.value & 0xff; + type = FIELD_GET(INT3472_GPIO_DSM_TYPE, obj->integer.value); int3472_get_func_and_polarity(type, &func, &polarity); - /* If bits 31-24 of the _DSM entry are all 0 then the signal is inverted */ - active_value = obj->integer.value >> 24; + active_value = FIELD_GET(INT3472_GPIO_DSM_SENSOR_ON_VAL, obj->integer.value); if (!active_value) polarity ^= GPIO_ACTIVE_LOW; |