diff options
author | Hans de Goede <hdegoede@redhat.com> | 2021-10-18 17:33:23 +0300 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2021-10-19 18:31:24 +0300 |
commit | 693841b74262f1c0483d8e72f83a97999e923433 (patch) | |
tree | e6c54a69d1336240f3f521a13c1cab0b364d07cc /drivers/platform/x86/intel/int0002_vgpio.c | |
parent | cd45c9bf8b43cd387e167cf166ae5c517f56d658 (diff) | |
download | linux-693841b74262f1c0483d8e72f83a97999e923433.tar.xz |
platform/x86: intel_int0002_vgpio: Use the new soc_intel_is_byt()/_cht() helpers
Use the new soc_intel_is_byt()/_cht() helpers to clean things up a bit.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211018143324.296961-3-hdegoede@redhat.com
Diffstat (limited to 'drivers/platform/x86/intel/int0002_vgpio.c')
-rw-r--r-- | drivers/platform/x86/intel/int0002_vgpio.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/platform/x86/intel/int0002_vgpio.c b/drivers/platform/x86/intel/int0002_vgpio.c index 569342aa8926..617dbf98980e 100644 --- a/drivers/platform/x86/intel/int0002_vgpio.c +++ b/drivers/platform/x86/intel/int0002_vgpio.c @@ -34,13 +34,11 @@ #include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/platform_data/x86/soc.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/suspend.h> -#include <asm/cpu_device_id.h> -#include <asm/intel-family.h> - #define DRV_NAME "INT0002 Virtual GPIO" /* For some reason the virtual GPIO pin tied to the GPE is numbered pin 2 */ @@ -151,12 +149,6 @@ static struct irq_chip int0002_irqchip = { .irq_set_wake = int0002_irq_set_wake, }; -static const struct x86_cpu_id int0002_cpu_ids[] = { - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, NULL), - X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, NULL), - {} -}; - static void int0002_init_irq_valid_mask(struct gpio_chip *chip, unsigned long *valid_mask, unsigned int ngpios) @@ -167,15 +159,13 @@ static void int0002_init_irq_valid_mask(struct gpio_chip *chip, static int int0002_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - const struct x86_cpu_id *cpu_id; struct int0002_data *int0002; struct gpio_irq_chip *girq; struct gpio_chip *chip; int irq, ret; /* Menlow has a different INT0002 device? <sigh> */ - cpu_id = x86_match_cpu(int0002_cpu_ids); - if (!cpu_id) + if (!soc_intel_is_byt() && !soc_intel_is_cht()) return -ENODEV; irq = platform_get_irq(pdev, 0); |