aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-05 05:46:30 -0500
committerMatthew Garrett <mjg@redhat.com>2011-02-07 16:52:22 -0500
commitcb8e5e6a60cab5a90afd45d49655458c6e1db78c (patch)
treeea8316e156087905c845ab740a5fa63a10e3b0c6 /drivers/platform
parent180e9d19eed63b0b153aff9f300b913f48788e37 (diff)
platform-drivers: x86: Convert pmic to new irq_chip functions
Old functions will go away soon. Remove the stray semicolons while at it. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Feng Tang <feng.tang@intel.com> Cc: Matthew Garrett <mjg@redhat.com> Cc: Alan Cox <alan@linux.intel.com> Cc: Alek Du <alek.du@intel.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel_pmic_gpio.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c
index 4eed130e7c18..9134d9d07569 100644
--- a/drivers/platform/x86/intel_pmic_gpio.c
+++ b/drivers/platform/x86/intel_pmic_gpio.c
@@ -190,10 +190,10 @@ static void pmic_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
190 1 << (offset - 16)); 190 1 << (offset - 16));
191} 191}
192 192
193static int pmic_irq_type(unsigned irq, unsigned type) 193static int pmic_irq_type(struct irq_data *data, unsigned type)
194{ 194{
195 struct pmic_gpio *pg = get_irq_chip_data(irq); 195 struct pmic_gpio *pg = irq_data_get_irq_chip_data(data);
196 u32 gpio = irq - pg->irq_base; 196 u32 gpio = data->irq - pg->irq_base;
197 unsigned long flags; 197 unsigned long flags;
198 198
199 if (gpio >= pg->chip.ngpio) 199 if (gpio >= pg->chip.ngpio)
@@ -207,8 +207,6 @@ static int pmic_irq_type(unsigned irq, unsigned type)
207 return 0; 207 return 0;
208} 208}
209 209
210
211
212static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset) 210static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
213{ 211{
214 struct pmic_gpio *pg = container_of(chip, struct pmic_gpio, chip); 212 struct pmic_gpio *pg = container_of(chip, struct pmic_gpio, chip);
@@ -217,19 +215,15 @@ static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
217} 215}
218 216
219/* the gpiointr register is read-clear, so just do nothing. */ 217/* the gpiointr register is read-clear, so just do nothing. */
220static void pmic_irq_unmask(unsigned irq) 218static void pmic_irq_unmask(struct irq_data *data) { }
221{
222};
223 219
224static void pmic_irq_mask(unsigned irq) 220static void pmic_irq_mask(struct irq_data *data) { }
225{
226};
227 221
228static struct irq_chip pmic_irqchip = { 222static struct irq_chip pmic_irqchip = {
229 .name = "PMIC-GPIO", 223 .name = "PMIC-GPIO",
230 .mask = pmic_irq_mask, 224 .irq_mask = pmic_irq_mask,
231 .unmask = pmic_irq_unmask, 225 .irq_unmask = pmic_irq_unmask,
232 .set_type = pmic_irq_type, 226 .irq_set_type = pmic_irq_type,
233}; 227};
234 228
235static void pmic_irq_handler(unsigned irq, struct irq_desc *desc) 229static void pmic_irq_handler(unsigned irq, struct irq_desc *desc)