x86/irq: Use accessor irq_data_get_irq_handler_data()

Use accessor function irq_data_get_irq_handler_data() to hide irq_desc
implementation details.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c
index 1a9d735e09c62f508d3226faafda2406eb75c843..5f1feb6854afe9ffa719d9099133c8b4b674a5a0 100644 (file)
--- a/arch/x86/kernel/apic/msi.c
+++ b/arch/x86/kernel/apic/msi.c
@@ -264,7 +264,7 @@ static inline int hpet_dev_id(struct irq_domain *domain)
 
 static void hpet_msi_write_msg(struct irq_data *data, struct msi_msg *msg)
 {
-       hpet_msi_write(data->handler_data, msg);
+       hpet_msi_write(irq_data_get_irq_handler_data(data), msg);
 }
 
 static struct irq_chip hpet_msi_controller = {

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 10757d0a3fcf438e43ffbfc634e7daa8dc110a2e..2de7e4e07dfa9d258a802ff21629fdb183ccb0b1 100644 (file)
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -426,7 +426,7 @@ static struct irq_domain *hpet_domain;
 
 void hpet_msi_unmask(struct irq_data *data)
 {
-       struct hpet_dev *hdev = data->handler_data;
+       struct hpet_dev *hdev = irq_data_get_irq_handler_data(data);
        unsigned int cfg;
 
        /* unmask it */
@@ -437,7 +437,7 @@ void hpet_msi_unmask(struct irq_data *data)
 
 void hpet_msi_mask(struct irq_data *data)
 {
-       struct hpet_dev *hdev = data->handler_data;
+       struct hpet_dev *hdev = irq_data_get_irq_handler_data(data);
        unsigned int cfg;
 
        /* mask it */