lkml.org 
[lkml]   [2010]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH 10/20] mfd: max8998: irq_data conversion.
    From
    Acked-by: Kyungmin Park <kyungmin.park@samsung.com>

    On Mon, Dec 13, 2010 at 9:30 PM, Lennert Buytenhek
    <buytenh@wantstofly.org> wrote:
    > Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
    > ---
    >  drivers/mfd/max8998-irq.c |   28 ++++++++++++++--------------
    >  1 files changed, 14 insertions(+), 14 deletions(-)
    >
    > diff --git a/drivers/mfd/max8998-irq.c b/drivers/mfd/max8998-irq.c
    > index 45bfe77..dca3c65 100644
    > --- a/drivers/mfd/max8998-irq.c
    > +++ b/drivers/mfd/max8998-irq.c
    > @@ -102,16 +102,16 @@ irq_to_max8998_irq(struct max8998_dev *max8998, int irq)
    >        return &max8998_irqs[irq - max8998->irq_base];
    >  }
    >
    > -static void max8998_irq_lock(unsigned int irq)
    > +static void max8998_irq_lock(struct irq_data *d)
    >  {
    > -       struct max8998_dev *max8998 = get_irq_chip_data(irq);
    > +       struct max8998_dev *max8998 = irq_data_get_irq_chip_data(d);
    >
    >        mutex_lock(&max8998->irqlock);
    >  }
    >
    > -static void max8998_irq_sync_unlock(unsigned int irq)
    > +static void max8998_irq_sync_unlock(struct irq_data *d)
    >  {
    > -       struct max8998_dev *max8998 = get_irq_chip_data(irq);
    > +       struct max8998_dev *max8998 = irq_data_get_irq_chip_data(d);
    >        int i;
    >
    >        for (i = 0; i < ARRAY_SIZE(max8998->irq_masks_cur); i++) {
    > @@ -129,28 +129,28 @@ static void max8998_irq_sync_unlock(unsigned int irq)
    >        mutex_unlock(&max8998->irqlock);
    >  }
    >
    > -static void max8998_irq_unmask(unsigned int irq)
    > +static void max8998_irq_unmask(struct irq_data *d)
    >  {
    > -       struct max8998_dev *max8998 = get_irq_chip_data(irq);
    > -       struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, irq);
    > +       struct max8998_dev *max8998 = irq_data_get_irq_chip_data(d);
    > +       struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, d->irq);
    >
    >        max8998->irq_masks_cur[irq_data->reg - 1] &= ~irq_data->mask;
    >  }
    >
    > -static void max8998_irq_mask(unsigned int irq)
    > +static void max8998_irq_mask(struct irq_data *d)
    >  {
    > -       struct max8998_dev *max8998 = get_irq_chip_data(irq);
    > -       struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, irq);
    > +       struct max8998_dev *max8998 = irq_data_get_irq_chip_data(d);
    > +       struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, d->irq);
    >
    >        max8998->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask;
    >  }
    >
    >  static struct irq_chip max8998_irq_chip = {
    >        .name = "max8998",
    > -       .bus_lock = max8998_irq_lock,
    > -       .bus_sync_unlock = max8998_irq_sync_unlock,
    > -       .mask = max8998_irq_mask,
    > -       .unmask = max8998_irq_unmask,
    > +       .irq_bus_lock = max8998_irq_lock,
    > +       .irq_bus_sync_unlock = max8998_irq_sync_unlock,
    > +       .irq_mask = max8998_irq_mask,
    > +       .irq_unmask = max8998_irq_unmask,
    >  };
    >
    >  static irqreturn_t max8998_irq_thread(int irq, void *data)
    > --
    > 1.7.1
    >
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at  http://vger.kernel.org/majordomo-info.html
    > Please read the FAQ at  http://www.tux.org/lkml/
    >
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-12-14 01:27    [W:0.039 / U:7.016 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site