projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'acpi-pci'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
irqchip
/
irq-s3c24xx.c
diff --git
a/drivers/irqchip/irq-s3c24xx.c
b/drivers/irqchip/irq-s3c24xx.c
index 7154b011ddd2f65a65f7079bfe88783c50d0d373..c71914e8f596c3700d8c5a4da2448b32acf8c41f 100644
(file)
--- a/
drivers/irqchip/irq-s3c24xx.c
+++ b/
drivers/irqchip/irq-s3c24xx.c
@@
-311,7
+311,7
@@
static void s3c_irq_demux(struct irq_desc *desc)
* and one big domain for the dt case where the subintc
* starts at hwirq number 32.
*/
* and one big domain for the dt case where the subintc
* starts at hwirq number 32.
*/
- offset =
(intc->domain->of_node
) ? 32 : 0;
+ offset =
irq_domain_get_of_node(intc->domain
) ? 32 : 0;
chained_irq_enter(chip, desc);
chained_irq_enter(chip, desc);
@@
-342,7
+342,7
@@
static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc,
return false;
/* non-dt machines use individual domains */
return false;
/* non-dt machines use individual domains */
- if (!i
ntc->domain->of_node
)
+ if (!i
rq_domain_get_of_node(intc->domain)
)
intc_offset = 0;
/* We have a problem that the INTOFFSET register does not always
intc_offset = 0;
/* We have a problem that the INTOFFSET register does not always