lkml.org 
[lkml]   [2011]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 2/3] 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>
    ---
    drivers/platform/x86/intel_pmic_gpio.c | 22 ++++++++--------------
    1 file changed, 8 insertions(+), 14 deletions(-)

    Index: linux-2.6/drivers/platform/x86/intel_pmic_gpio.c
    ===================================================================
    --- linux-2.6.orig/drivers/platform/x86/intel_pmic_gpio.c
    +++ linux-2.6/drivers/platform/x86/intel_pmic_gpio.c
    @@ -190,10 +190,10 @@ static void pmic_gpio_set(struct gpio_ch
    1 << (offset - 16));
    }

    -static int pmic_irq_type(unsigned irq, unsigned type)
    +static int pmic_irq_type(struct irq_data *data, unsigned type)
    {
    - struct pmic_gpio *pg = get_irq_chip_data(irq);
    - u32 gpio = irq - pg->irq_base;
    + struct pmic_gpio *pg = irq_data_get_irq_chip_data(data);
    + u32 gpio = data->irq - pg->irq_base;
    unsigned long flags;

    if (gpio >= pg->chip.ngpio)
    @@ -207,8 +207,6 @@ static int pmic_irq_type(unsigned irq, u
    return 0;
    }

    -
    -
    static int pmic_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
    {
    struct pmic_gpio *pg = container_of(chip, struct pmic_gpio, chip);
    @@ -217,19 +215,15 @@ static int pmic_gpio_to_irq(struct gpio_
    }

    /* the gpiointr register is read-clear, so just do nothing. */
    -static void pmic_irq_unmask(unsigned irq)
    -{
    -};
    +static void pmic_irq_unmask(struct irq_data *data) { }

    -static void pmic_irq_mask(unsigned irq)
    -{
    -};
    +static void pmic_irq_mask(struct irq_data *data) { }

    static struct irq_chip pmic_irqchip = {
    .name = "PMIC-GPIO",
    - .mask = pmic_irq_mask,
    - .unmask = pmic_irq_unmask,
    - .set_type = pmic_irq_type,
    + .irq_mask = pmic_irq_mask,
    + .irq_unmask = pmic_irq_unmask,
    + .irq_set_type = pmic_irq_type,
    };

    static void pmic_irq_handler(unsigned irq, struct irq_desc *desc)



    \
     
     \ /
      Last update: 2011-02-05 11:49    [W:0.021 / U:0.964 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site