Skip to content

W
White Rabbit Switch - Software
Commit 4ac12f3e authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

kernel/htvic: fixes to build on 4.14

parent 18e2ba3d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
kernel/coht_vic/htvic.c
View file @ 4ac12f3e
...@@ -144,7 +144,7 @@ static struct irq_chip htvic_chip = { ...@@ -144,7 +144,7 @@ static struct irq_chip htvic_chip = {
* In our case here we expect a string because we identify this domain by * In our case here we expect a string because we identify this domain by
* name * name
*/ */
static int htvic_irq_domain_match(struct irq_domain *d, struct device_node *node) static int htvic_irq_domain_match(struct irq_domain *d, struct device_node *node, enum irq_domain_bus_token bus_token)
{ {
char *name = (char *)node; char *name = (char *)node;
...@@ -206,10 +206,10 @@ static struct irq_domain_ops htvic_irq_domain_ops = { ...@@ -206,10 +206,10 @@ static struct irq_domain_ops htvic_irq_domain_ops = {
* When the platform receives an interrupt it will call than this function * When the platform receives an interrupt it will call than this function
* which then will call the proper handler * which then will call the proper handler
*/ */
static void htvic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) static void htvic_handle_cascade_irq(struct irq_desc *desc)
{ {
struct htvic_device *htvic = irq_get_handler_data(irq); struct htvic_device *htvic = irq_data_get_irq_handler_data(&desc->irq_data);
struct irq_chip *chip = irq_get_chip(irq); struct irq_chip *chip = irq_data_get_irq_chip(&desc->irq_data);
unsigned int cascade_irq, /* i = 0, */ vect; unsigned int cascade_irq, /* i = 0, */ vect;
/* unsigned long status; */ /* unsigned long status; */
...@@ -271,7 +271,7 @@ static int htvic_irq_mapping(struct htvic_device *htvic) ...@@ -271,7 +271,7 @@ static int htvic_irq_mapping(struct htvic_device *htvic)
irq = platform_get_irq(htvic->pdev, 0); irq = platform_get_irq(htvic->pdev, 0);
desc = irq_to_desc(irq); desc = irq_to_desc(irq);
htvic->platform_handle_irq = desc->handle_irq; htvic->platform_handle_irq = desc->handle_irq;
htvic->platform_handler_data = desc->irq_data.handler_data; htvic->platform_handler_data = htvic; //desc->irq_data.chip_data;
if (irq_set_handler_data(irq, htvic) != 0) if (irq_set_handler_data(irq, htvic) != 0)
BUG(); BUG();
...@@ -424,7 +424,7 @@ out_memop: ...@@ -424,7 +424,7 @@ out_memop:
void __htvic_irq_shutdown(struct irq_desc *desc) void __htvic_irq_shutdown(struct irq_desc *desc)
{ {
/* irq_state_set_disabled(desc); */ /* irq_state_set_disabled(desc); */
desc->irq_data.state_use_accessors |= IRQD_IRQ_DISABLED; desc->irq_data.common->state_use_accessors |= IRQD_IRQ_DISABLED;
desc->depth = 1; desc->depth = 1;
if (desc->irq_data.chip->irq_shutdown) if (desc->irq_data.chip->irq_shutdown)
desc->irq_data.chip->irq_shutdown(&desc->irq_data); desc->irq_data.chip->irq_shutdown(&desc->irq_data);
...@@ -433,7 +433,7 @@ void __htvic_irq_shutdown(struct irq_desc *desc) ...@@ -433,7 +433,7 @@ void __htvic_irq_shutdown(struct irq_desc *desc)
else else
desc->irq_data.chip->irq_mask(&desc->irq_data); desc->irq_data.chip->irq_mask(&desc->irq_data);
/* irq_state_set_masked(desc); */ /* irq_state_set_masked(desc); */
desc->irq_data.state_use_accessors |= IRQD_IRQ_MASKED; desc->irq_data.common->state_use_accessors |= IRQD_IRQ_MASKED;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment