Commit 8317d5178e7491589693693e5a7f64442cf46ca2
1 parent
d6f7ce9f7f
Exists in
master
and in
4 other branches
mfd: Clean up max8997 IRQ namespace
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Showing 1 changed file with 8 additions and 8 deletions Side-by-side Diff
drivers/mfd/max8997-irq.c
| ... | ... | @@ -115,14 +115,14 @@ |
| 115 | 115 | |
| 116 | 116 | static void max8997_irq_lock(struct irq_data *data) |
| 117 | 117 | { |
| 118 | - struct max8997_dev *max8997 = get_irq_chip_data(data->irq); | |
| 118 | + struct max8997_dev *max8997 = irq_get_chip_data(data->irq); | |
| 119 | 119 | |
| 120 | 120 | mutex_lock(&max8997->irqlock); |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | static void max8997_irq_sync_unlock(struct irq_data *data) |
| 124 | 124 | { |
| 125 | - struct max8997_dev *max8997 = get_irq_chip_data(data->irq); | |
| 125 | + struct max8997_dev *max8997 = irq_get_chip_data(data->irq); | |
| 126 | 126 | int i; |
| 127 | 127 | |
| 128 | 128 | for (i = 0; i < MAX8997_IRQ_GROUP_NR; i++) { |
| ... | ... | @@ -149,7 +149,7 @@ |
| 149 | 149 | |
| 150 | 150 | static void max8997_irq_mask(struct irq_data *data) |
| 151 | 151 | { |
| 152 | - struct max8997_dev *max8997 = get_irq_chip_data(data->irq); | |
| 152 | + struct max8997_dev *max8997 = irq_get_chip_data(data->irq); | |
| 153 | 153 | const struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997, |
| 154 | 154 | data->irq); |
| 155 | 155 | |
| ... | ... | @@ -158,7 +158,7 @@ |
| 158 | 158 | |
| 159 | 159 | static void max8997_irq_unmask(struct irq_data *data) |
| 160 | 160 | { |
| 161 | - struct max8997_dev *max8997 = get_irq_chip_data(data->irq); | |
| 161 | + struct max8997_dev *max8997 = irq_get_chip_data(data->irq); | |
| 162 | 162 | const struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997, |
| 163 | 163 | data->irq); |
| 164 | 164 | |
| 165 | 165 | |
| 166 | 166 | |
| ... | ... | @@ -332,14 +332,14 @@ |
| 332 | 332 | /* Register with genirq */ |
| 333 | 333 | for (i = 0; i < MAX8997_IRQ_NR; i++) { |
| 334 | 334 | cur_irq = i + max8997->irq_base; |
| 335 | - set_irq_chip_data(cur_irq, max8997); | |
| 336 | - set_irq_chip_and_handler(cur_irq, &max8997_irq_chip, | |
| 335 | + irq_set_chip_data(cur_irq, max8997); | |
| 336 | + irq_set_chip_and_handler(cur_irq, &max8997_irq_chip, | |
| 337 | 337 | handle_edge_irq); |
| 338 | - set_irq_nested_thread(cur_irq, 1); | |
| 338 | + irq_set_nested_thread(cur_irq, 1); | |
| 339 | 339 | #ifdef CONFIG_ARM |
| 340 | 340 | set_irq_flags(cur_irq, IRQF_VALID); |
| 341 | 341 | #else |
| 342 | - set_irq_noprobe(cur_irq); | |
| 342 | + irq_set_noprobe(cur_irq); | |
| 343 | 343 | #endif |
| 344 | 344 | } |
| 345 | 345 |