leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: SAMSUNG: some GENERIC_HARDIRQS_NO_DEPRECATED build fixes

Browse Source 
When GENERIC_HARDIRQS_NO_DEPRECATED is enabled, a number of struct
irq_desc members stop being directly accessible, and need to be
accessed via the irq_data struct instead -- this patch fixes up the
plat-samsung sites that still access those members directly.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Lennert Buytenhek 2010-12-14 22:55:57 +01:00 committed by Kukjin Kim
parent bb0b237467
commit 04ea1cc8ab
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/plat-samsung/irq-uart.c
View File

@ -30,7 +30,7 @@
static inline void __iomem *s3c_irq_uart_base(struct irq_data *data) 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; 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) 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); u32 pend = __raw_readl(uirq->regs + S3C64XX_UINTP);
int base = uirq->base_irq; 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); 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); set_irq_chained_handler(uirq->parent_irq, s3c_irq_demux_uart);
} }

4
arch/arm/plat-samsung/irq-vic-timer.c
View File

@ -24,7 +24,7 @@
static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc) 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. */ /* 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_handler(timer_irq, handle_level_irq);
set_irq_flags(timer_irq, IRQF_VALID); set_irq_flags(timer_irq, IRQF_VALID);
desc->handler_data = (void *)timer_irq; desc->irq_data.handler_data = (void *)timer_irq;
} }