openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

platform/x86: intel_int0002_vgpio: Get rid of custom ICPU() macro 

Replace custom grown macro with generic INTEL_CPU_FAM6() one.

No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Andy Shevchenko 2019-06-19 17:50:50 +03:00
parent 9452fbf5c6
commit 568aeeeb69
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/platform/x86/intel_int0002_vgpio.c
View File

@ -51,17 +51,6 @@
#define GPE0A_STS_PORT 0x420 #define GPE0A_STS_PORT 0x420
#define GPE0A_EN_PORT 0x428 #define GPE0A_EN_PORT 0x428
#define BAYTRAIL 0x01
#define CHERRYTRAIL 0x02
#define ICPU(model, data) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, data }
static const struct x86_cpu_id int0002_cpu_ids[] = {
ICPU(INTEL_FAM6_ATOM_SILVERMONT, BAYTRAIL), /* Valleyview, Bay Trail */
ICPU(INTEL_FAM6_ATOM_AIRMONT, CHERRYTRAIL), /* Braswell, Cherry Trail */
{}
};
/* /*
* As this is not a real GPIO at all, but just a hack to model an event in * As this is not a real GPIO at all, but just a hack to model an event in
* ACPI the get / set functions are dummy functions. * ACPI the get / set functions are dummy functions.
@ -157,6 +146,12 @@ static struct irq_chip int0002_cht_irqchip = {
*/ */
}; };
static const struct x86_cpu_id int0002_cpu_ids[] = {
INTEL_CPU_FAM6(ATOM_SILVERMONT, int0002_byt_irqchip), /* Valleyview, Bay Trail */
INTEL_CPU_FAM6(ATOM_AIRMONT, int0002_cht_irqchip), /* Braswell, Cherry Trail */
{}
};
static int int0002_probe(struct platform_device *pdev) static int int0002_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -210,10 +205,7 @@ static int int0002_probe(struct platform_device *pdev)
return ret; return ret;
} }
if (cpu_id->driver_data == BAYTRAIL) irq_chip = (struct irq_chip *)cpu_id->driver_data;
irq_chip = &int0002_byt_irqchip;
else
irq_chip = &int0002_cht_irqchip;
ret = gpiochip_irqchip_add(chip, irq_chip, 0, handle_edge_irq, ret = gpiochip_irqchip_add(chip, irq_chip, 0, handle_edge_irq,
IRQ_TYPE_NONE); IRQ_TYPE_NONE);