diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 11:20:21 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 11:20:21 +0100 |
| commit | f651ef6575d8816143afbad4492584979589bd46 (patch) | |
| tree | 48d8cd0acd54822e7732158ed012caff44dc7100 /arch/arm/plat-samsung | |
| parent | Merge branch 'next-s5pv310' into for-next (diff) | |
| parent | ARM: SAMSUNG: some GENERIC_HARDIRQS_NO_DEPRECATED build fixes (diff) | |
| download | linux-f651ef6575d8816143afbad4492584979589bd46.tar.xz linux-f651ef6575d8816143afbad4492584979589bd46.zip | |
Merge branch 'next-samsung-irq_data' into for-next
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/irq-uart.c | 6 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/irq-vic-timer.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/plat-samsung/irq-uart.c b/arch/arm/plat-samsung/irq-uart.c index da31d785cbd1..4e770355ccbc 100644 --- a/arch/arm/plat-samsung/irq-uart.c +++ b/arch/arm/plat-samsung/irq-uart.c @@ -30,7 +30,7 @@ static inline void __iomem *s3c_irq_uart_base(struct irq_data *data) { - struct s3c_uart_irq *uirq = data->chip_data; + struct s3c_uart_irq *uirq = irq_data_get_irq_chip_data(data); return uirq->regs; } @@ -83,7 +83,7 @@ static void s3c_irq_uart_ack(struct irq_data *data) static void s3c_irq_demux_uart(unsigned int irq, struct irq_desc *desc) { - struct s3c_uart_irq *uirq = desc->handler_data; + struct s3c_uart_irq *uirq = desc->irq_data.handler_data; u32 pend = __raw_readl(uirq->regs + S3C64XX_UINTP); int base = uirq->base_irq; @@ -124,7 +124,7 @@ static void __init s3c_init_uart_irq(struct s3c_uart_irq *uirq) set_irq_flags(irq, IRQF_VALID); } - desc->handler_data = uirq; + desc->irq_data.handler_data = uirq; set_irq_chained_handler(uirq->parent_irq, s3c_irq_demux_uart); } diff --git a/arch/arm/plat-samsung/irq-vic-timer.c b/arch/arm/plat-samsung/irq-vic-timer.c index 7ce77ddb729d..dd8692ae5c4c 100644 --- a/arch/arm/plat-samsung/irq-vic-timer.c +++ b/arch/arm/plat-samsung/irq-vic-timer.c @@ -24,7 +24,7 @@ static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc) { - generic_handle_irq((int)desc->handler_data); + generic_handle_irq((int)desc->irq_data.handler_data); } /* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */ @@ -86,5 +86,5 @@ void __init s3c_init_vic_timer_irq(unsigned int parent_irq, set_irq_handler(timer_irq, handle_level_irq); set_irq_flags(timer_irq, IRQF_VALID); - desc->handler_data = (void *)timer_irq; + desc->irq_data.handler_data = (void *)timer_irq; } |