mfd: 88pm860x-core: irq_data conversion.
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/20 mfd: 88pm860x-core: irq_data conversion.
--- drivers/mfd/88pm860x-core.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
drivers/mfd/88pm860x-core.c +16 -16
@@ -388,16 +388,16 @@ static irqreturn_t pm860x_irq(int irq, void *data)return IRQ_HANDLED ; } -static void pm860x_irq_lock (unsigned int irq) +static void pm860x_irq_lock (struct irq_data *d) { -struct pm860x_chip *chip =get_irq_chip_data (irq); +struct pm860x_chip *chip =irq_data_get_irq_chip_data (d);mutex_lock (&chip->irq_lock); } -static void pm860x_irq_sync_unlock (unsigned int irq) +static void pm860x_irq_sync_unlock (struct irq_data *d) { -struct pm860x_chip *chip =get_irq_chip_data (irq); +struct pm860x_chip *chip =irq_data_get_irq_chip_data (d);struct pm860x_irq_data *irq_data;struct i2c_client *i2c;static unsigned char cached[3 ] = {0x0 ,0x0 ,0x0 };
@@ -439,25 +439,25 @@ static void pm860x_irq_sync_unlock(unsigned int irq)mutex_unlock (&chip->irq_lock); } -static void pm860x_irq_enable (unsigned int irq) +static void pm860x_irq_enable (struct irq_data *d) { -struct pm860x_chip *chip =get_irq_chip_data (irq); - pm860x_irqs[irq - chip->irq_base].enable - = pm860x_irqs[irq - chip->irq_base].offs; +struct pm860x_chip *chip =irq_data_get_irq_chip_data (d); + pm860x_irqs[d->irq - chip->irq_base].enable + = pm860x_irqs[d->irq - chip->irq_base].offs; } -static void pm860x_irq_disable (unsigned int irq) +static void pm860x_irq_disable (struct irq_data *d) { -struct pm860x_chip *chip =get_irq_chip_data (irq); - pm860x_irqs[irq - chip->irq_base].enable =0 ; +struct pm860x_chip *chip =irq_data_get_irq_chip_data (d); + pm860x_irqs[d->irq - chip->irq_base].enable =0 ; }static struct irq_chip pm860x_irq_chip = { - .name ="88pm860x" , - .bus_lock = pm860x_irq_lock, - .bus_sync_unlock = pm860x_irq_sync_unlock, - .enable = pm860x_irq_enable, - .disable = pm860x_irq_disable, + .name ="88pm860x" , + .irq_bus_lock = pm860x_irq_lock, + .irq_bus_sync_unlock = pm860x_irq_sync_unlock, + .irq_enable = pm860x_irq_enable, + .irq_disable = pm860x_irq_disable, }; static int __devinit device_gpadc_init(struct pm860x_chip *chip,
Signature · 1 line
1.7.1
PATCH 2/20 mfd: ab3550: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/ab3550-core.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-)
drivers/mfd/ab3550-core.c +17 -15
@@ -1159,15 +1159,16 @@ static void ab3550_mask_work(struct work_struct *work) } } -static void ab3550_mask (unsigned int irq) +static void ab3550_mask (struct irq_data *d) {unsigned long flags;struct ab3550 *ab;struct ab3550_platform_data *plf_data; +unsigned int irq; - ab =get_irq_chip_data (irq); + ab =irq_data_get_irq_chip_data (d); plf_data = ab->i2c_client[0 ]->dev.platform_data; - irq -= plf_data->irq.base; + irq = d->irq - plf_data->irq.base;spin_lock_irqsave (&ab->event_lock, flags); ab->event_mask[irq /8 ] |=BIT (irq %8 );
@@ -1176,15 +1177,16 @@ static void ab3550_mask(unsigned int irq)schedule_work (&ab->mask_work); } -static void ab3550_unmask (unsigned int irq) +static void ab3550_unmask (struct irq_data *d) {unsigned long flags;struct ab3550 *ab;struct ab3550_platform_data *plf_data; +unsigned int irq; - ab =get_irq_chip_data (irq); + ab =irq_data_get_irq_chip_data (d); plf_data = ab->i2c_client[0 ]->dev.platform_data; - irq -= plf_data->irq.base; + irq = d->irq - plf_data->irq.base;spin_lock_irqsave (&ab->event_lock, flags); ab->event_mask[irq /8 ] &= ~BIT (irq %8 );
@@ -1193,20 +1195,20 @@ static void ab3550_unmask(unsigned int irq)schedule_work (&ab->mask_work); } -static void noop (unsigned int irq) +static void noop (struct irq_data *d) { }static struct irq_chip ab3550_irq_chip = { .name ="ab3550-core" ,/* Keep the same name as the request */ - .startup =NULL ,/* defaults to enable */ - .shutdown =NULL ,/* defaults to disable */ - .enable =NULL ,/* defaults to unmask */ - .disable = ab3550_mask,/* No default to mask in chip.c */ - .ack = noop, - .mask = ab3550_mask, - .unmask = ab3550_unmask, - .end =NULL , + .irq_startup =NULL ,/* defaults to enable */ + .irq_shutdown =NULL ,/* defaults to disable */ + .irq_enable =NULL ,/* defaults to unmask */ + .irq_disable = ab3550_mask,/* No default to mask in chip.c */ + .irq_ack = noop, + .irq_mask = ab3550_mask, + .irq_unmask = ab3550_unmask, + .irq_end =NULL , };struct ab_family_id {
Signature · 1 line
1.7.1
PATCH 3/20 mfd: ab8500: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/ab8500-core.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/mfd/ab8500-core.c +14 -14
@@ -228,16 +228,16 @@ static struct abx500_ops ab8500_ops = { .startup_irq_enabled = NULL, }; -static void ab8500_irq_lock (unsigned int irq) +static void ab8500_irq_lock (struct irq_data *d) { -struct ab8500 *ab8500 =get_irq_chip_data (irq); +struct ab8500 *ab8500 =irq_data_get_irq_chip_data (d);mutex_lock (&ab8500->irq_lock); } -static void ab8500_irq_sync_unlock (unsigned int irq) +static void ab8500_irq_sync_unlock (struct irq_data *d) { -struct ab8500 *ab8500 =get_irq_chip_data (irq); +struct ab8500 *ab8500 =irq_data_get_irq_chip_data (d);int i;for (i =0 ; i <AB8500_NUM_IRQ_REGS ; i++) {
@@ -257,20 +257,20 @@ static void ab8500_irq_sync_unlock(unsigned int irq)mutex_unlock (&ab8500->irq_lock); } -static void ab8500_irq_mask (unsigned int irq) +static void ab8500_irq_mask (struct irq_data *d) { -struct ab8500 *ab8500 =get_irq_chip_data (irq); -int offset = irq - ab8500->irq_base; +struct ab8500 *ab8500 =irq_data_get_irq_chip_data (d); +int offset = d->irq - ab8500->irq_base;int index = offset /8 ;int mask =1 << (offset %8 ); ab8500->mask[index] |= mask; } -static void ab8500_irq_unmask (unsigned int irq) +static void ab8500_irq_unmask (struct irq_data *d) { -struct ab8500 *ab8500 =get_irq_chip_data (irq); -int offset = irq - ab8500->irq_base; +struct ab8500 *ab8500 =irq_data_get_irq_chip_data (d); +int offset = d->irq - ab8500->irq_base;int index = offset /8 ;int mask =1 << (offset %8 );
@@ -279,10 +279,10 @@ static void ab8500_irq_unmask(unsigned int irq)static struct irq_chip ab8500_irq_chip = { .name ="ab8500" , - .bus_lock = ab8500_irq_lock, - .bus_sync_unlock = ab8500_irq_sync_unlock, - .mask = ab8500_irq_mask, - .unmask = ab8500_irq_unmask, + .irq_bus_lock = ab8500_irq_lock, + .irq_bus_sync_unlock = ab8500_irq_sync_unlock, + .irq_mask = ab8500_irq_mask, + .irq_unmask = ab8500_irq_unmask, };static irqreturn_t ab8500_irq (int irq,void *dev)
Signature · 1 line
1.7.1
PATCH 4/20 mfd: asic3: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/asic3.c | 60 +++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 30 deletions(-)
drivers/mfd/asic3.c +30 -30
@@ -143,9 +143,9 @@ static void asic3_irq_demux(unsigned int irq, struct irq_desc *desc)unsigned long flags;struct asic3 *asic; - desc->chip->ack (irq); + desc->irq_data.chip->irq_ack (&desc->irq_data); - asic = desc->handler_data; + asic =get_irq_data (irq);for (iter =0 ; iter <MAX_ASIC_ISR_LOOPS ; iter++) {u32 status;
@@ -226,14 +226,14 @@ static inline int asic3_irq_to_index(struct asic3 *asic, int irq)return (irq - asic->irq_base) &0xf ; } -static void asic3_mask_gpio_irq (unsigned int irq) +static void asic3_mask_gpio_irq (struct irq_data *d) { -struct asic3 *asic =get_irq_chip_data (irq); +struct asic3 *asic =irq_data_get_irq_chip_data (d);u32 val, bank, index;unsigned long flags; - bank =asic3_irq_to_bank (asic, irq); - index =asic3_irq_to_index (asic, irq); + bank =asic3_irq_to_bank (asic, d->irq); + index =asic3_irq_to_index (asic, d->irq);spin_lock_irqsave (&asic->lock, flags); val =asic3_read_register (asic, bank +ASIC3_GPIO_MASK );
@@ -242,9 +242,9 @@ static void asic3_mask_gpio_irq(unsigned int irq)spin_unlock_irqrestore (&asic->lock, flags); } -static void asic3_mask_irq (unsigned int irq) +static void asic3_mask_irq (struct irq_data *d) { -struct asic3 *asic =get_irq_chip_data (irq); +struct asic3 *asic =irq_data_get_irq_chip_data (d);int regval;unsigned long flags;
@@ -254,7 +254,7 @@ static void asic3_mask_irq(unsigned int irq) ASIC3_INTR_INT_MASK); regval &= ~(ASIC3_INTMASK_MASK0 << - (irq - (asic->irq_base +ASIC3_NUM_GPIOS ))); + (d->irq - (asic->irq_base +ASIC3_NUM_GPIOS ))); asic3_write_register(asic, ASIC3_INTR_BASE +
@@ -263,14 +263,14 @@ static void asic3_mask_irq(unsigned int irq)spin_unlock_irqrestore (&asic->lock, flags); } -static void asic3_unmask_gpio_irq (unsigned int irq) +static void asic3_unmask_gpio_irq (struct irq_data *d) { -struct asic3 *asic =get_irq_chip_data (irq); +struct asic3 *asic =irq_data_get_irq_chip_data (d);u32 val, bank, index;unsigned long flags; - bank =asic3_irq_to_bank (asic, irq); - index =asic3_irq_to_index (asic, irq); + bank =asic3_irq_to_bank (asic, d->irq); + index =asic3_irq_to_index (asic, d->irq);spin_lock_irqsave (&asic->lock, flags); val =asic3_read_register (asic, bank +ASIC3_GPIO_MASK );
@@ -279,9 +279,9 @@ static void asic3_unmask_gpio_irq(unsigned int irq)spin_unlock_irqrestore (&asic->lock, flags); } -static void asic3_unmask_irq (unsigned int irq) +static void asic3_unmask_irq (struct irq_data *d) { -struct asic3 *asic =get_irq_chip_data (irq); +struct asic3 *asic =irq_data_get_irq_chip_data (d);int regval;unsigned long flags;
@@ -291,7 +291,7 @@ static void asic3_unmask_irq(unsigned int irq) ASIC3_INTR_INT_MASK); regval |= (ASIC3_INTMASK_MASK0 << - (irq - (asic->irq_base +ASIC3_NUM_GPIOS ))); + (d->irq - (asic->irq_base +ASIC3_NUM_GPIOS ))); asic3_write_register(asic, ASIC3_INTR_BASE +
@@ -300,15 +300,15 @@ static void asic3_unmask_irq(unsigned int irq)spin_unlock_irqrestore (&asic->lock, flags); } -static int asic3_gpio_irq_type (unsigned int irq,unsigned int type) +static int asic3_gpio_irq_type (struct irq_data *d,unsigned int type) { -struct asic3 *asic =get_irq_chip_data (irq); +struct asic3 *asic =irq_data_get_irq_chip_data (d);u32 bank, index;u16 trigger, level, edge, bit;unsigned long flags; - bank =asic3_irq_to_bank (asic, irq); - index =asic3_irq_to_index (asic, irq); + bank =asic3_irq_to_bank (asic, d->irq); + index =asic3_irq_to_index (asic, d->irq); bit =1 <<index;spin_lock_irqsave (&asic->lock, flags);
@@ -318,7 +318,7 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type) bank + ASIC3_GPIO_EDGE_TRIGGER); trigger =asic3_read_register (asic, bank +ASIC3_GPIO_TRIGGER_TYPE ); - asic->irq_bothedge[(irq - asic->irq_base) >>4 ] &= ~bit; + asic->irq_bothedge[(d->irq - asic->irq_base) >>4 ] &= ~bit;if (type ==IRQ_TYPE_EDGE_RISING ) { trigger |= bit;
@@ -328,11 +328,11 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type) edge &= ~bit; }else if (type ==IRQ_TYPE_EDGE_BOTH ) { trigger |= bit; -if (asic3_gpio_get (&asic->gpio, irq - asic->irq_base)) +if (asic3_gpio_get (&asic->gpio, d->irq - asic->irq_base)) edge &= ~bit;else edge |= bit; - asic->irq_bothedge[(irq - asic->irq_base) >>4 ] |= bit; + asic->irq_bothedge[(d->irq - asic->irq_base) >>4 ] |= bit; }else if (type ==IRQ_TYPE_LEVEL_LOW ) { trigger &= ~bit; level &= ~bit;
@@ -359,17 +359,17 @@ static int asic3_gpio_irq_type(unsigned int irq, unsigned int type)static struct irq_chip asic3_gpio_irq_chip = { .name ="ASIC3-GPIO" , - .ack = asic3_mask_gpio_irq, - .mask = asic3_mask_gpio_irq, - .unmask = asic3_unmask_gpio_irq, - .set_type = asic3_gpio_irq_type, + .irq_ack = asic3_mask_gpio_irq, + .irq_mask = asic3_mask_gpio_irq, + .irq_unmask = asic3_unmask_gpio_irq, + .irq_set_type = asic3_gpio_irq_type, };static struct irq_chip asic3_irq_chip = { .name ="ASIC3" , - .ack = asic3_mask_irq, - .mask = asic3_mask_irq, - .unmask = asic3_unmask_irq, + .irq_ack = asic3_mask_irq, + .irq_mask = asic3_mask_irq, + .irq_unmask = asic3_unmask_irq, };static int __init asic3_irq_probe (struct platform_device *pdev)
Signature · 1 line
1.7.1
PATCH 5/20 mfd: ezx-pcap: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/ezx-pcap.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/mfd/ezx-pcap.c +10 -10
@@ -144,26 +144,26 @@ int pcap_to_irq(struct pcap_chip *pcap, int irq) }EXPORT_SYMBOL_GPL (pcap_to_irq); -static void pcap_mask_irq (unsigned int irq) +static void pcap_mask_irq (struct irq_data *d) { -struct pcap_chip *pcap =get_irq_chip_data (irq); +struct pcap_chip *pcap =irq_data_get_irq_chip_data (d); - pcap->msr |=1 <<irq_to_pcap (pcap, irq); + pcap->msr |=1 <<irq_to_pcap (pcap, d->irq);queue_work (pcap->workqueue, &pcap->msr_work); } -static void pcap_unmask_irq (unsigned int irq) +static void pcap_unmask_irq (struct irq_data *d) { -struct pcap_chip *pcap =get_irq_chip_data (irq); +struct pcap_chip *pcap =irq_data_get_irq_chip_data (d); - pcap->msr &= ~(1 <<irq_to_pcap (pcap, irq)); + pcap->msr &= ~(1 <<irq_to_pcap (pcap, d->irq));queue_work (pcap->workqueue, &pcap->msr_work); }static struct irq_chip pcap_irq_chip = { - .name ="pcap" , - .mask = pcap_mask_irq, - .unmask = pcap_unmask_irq, + .name ="pcap" , + .irq_mask = pcap_mask_irq, + .irq_unmask = pcap_unmask_irq, };static void pcap_msr_work (struct work_struct *work)
@@ -218,7 +218,7 @@ static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc) {struct pcap_chip *pcap =get_irq_data (irq); - desc->chip->ack (irq); + desc->irq_data.chip->irq_ack (&desc->irq_data);queue_work (pcap->workqueue, &pcap->isr_work);return ; }
Signature · 1 line
1.7.1
PATCH 6/20 mfd: htc-egpio: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/htc-egpio.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-)
drivers/mfd/htc-egpio.c +14 -13
@@ -70,31 +70,32 @@ static inline void ack_irqs(struct egpio_info *ei) ei->ack_write, ei->ack_register << ei->bus_shift); } -static void egpio_ack (unsigned int irq) +static void egpio_ack (struct irq_data *d) { }/* There does not appear to be a way to proactively mask interrupts * on the egpio chip itself. So, we simply ignore interrupts that * aren't desired. */ -static void egpio_mask (unsigned int irq) +static void egpio_mask (struct irq_data *d) { -struct egpio_info *ei =get_irq_chip_data (irq); - ei->irqs_enabled &= ~(1 << (irq - ei->irq_start)); -pr_debug ("EGPIO mask %d %04x\n" , irq, ei->irqs_enabled); +struct egpio_info *ei =irq_data_get_irq_chip_data (d); + ei->irqs_enabled &= ~(1 << (d->irq - ei->irq_start)); +pr_debug ("EGPIO mask %d %04x\n" , d->irq, ei->irqs_enabled); } -static void egpio_unmask (unsigned int irq) + +static void egpio_unmask (struct irq_data *d) { -struct egpio_info *ei =get_irq_chip_data (irq); - ei->irqs_enabled |=1 << (irq - ei->irq_start); -pr_debug ("EGPIO unmask %d %04x\n" , irq, ei->irqs_enabled); +struct egpio_info *ei =irq_data_get_irq_chip_data (d); + ei->irqs_enabled |=1 << (d->irq - ei->irq_start); +pr_debug ("EGPIO unmask %d %04x\n" , d->irq, ei->irqs_enabled); }static struct irq_chip egpio_muxed_chip = { - .name ="htc-egpio" , - .ack = egpio_ack, - .mask = egpio_mask, - .unmask = egpio_unmask, + .name ="htc-egpio" , + .irq_ack = egpio_ack, + .irq_mask = egpio_mask, + .irq_unmask = egpio_unmask, };static void egpio_handler (unsigned int irq,struct irq_desc *desc)
Signature · 1 line
1.7.1
PATCH 7/20 mfd: htc-i2cpld: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/htc-i2cpld.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-)
drivers/mfd/htc-i2cpld.c +16 -15
@@ -82,25 +82,26 @@ struct htcpld_data {/* There does not appear to be a way to proactively mask interrupts * on the htcpld chip itself. So, we simply ignore interrupts that * aren't desired. */ -static void htcpld_mask (unsigned int irq) +static void htcpld_mask (struct irq_data *d) { -struct htcpld_chip *chip =get_irq_chip_data (irq); - chip->irqs_enabled &= ~(1 << (irq - chip->irq_start)); -pr_debug ("HTCPLD mask %d %04x\n" , irq, chip->irqs_enabled); +struct htcpld_chip *chip =irq_data_get_irq_chip_data (d); + chip->irqs_enabled &= ~(1 << (d->irq - chip->irq_start)); +pr_debug ("HTCPLD mask %d %04x\n" , d->irq, chip->irqs_enabled); } -static void htcpld_unmask (unsigned int irq) + +static void htcpld_unmask (struct irq_data *d) { -struct htcpld_chip *chip =get_irq_chip_data (irq); - chip->irqs_enabled |=1 << (irq - chip->irq_start); -pr_debug ("HTCPLD unmask %d %04x\n" , irq, chip->irqs_enabled); +struct htcpld_chip *chip =irq_data_get_irq_chip_data (d); + chip->irqs_enabled |=1 << (d->irq - chip->irq_start); +pr_debug ("HTCPLD unmask %d %04x\n" , d->irq, chip->irqs_enabled); } -static int htcpld_set_type (unsigned int irq,unsigned int flags) +static int htcpld_set_type (struct irq_data *d,unsigned int flags) { -struct irq_desc *d =irq_to_desc (irq); +struct irq_desc *d =irq_to_desc (d->irq);if (!d) { -pr_err ("HTCPLD invalid IRQ: %d\n" , irq); +pr_err ("HTCPLD invalid IRQ: %d\n" , d->irq);return -EINVAL ; }
@@ -118,10 +119,10 @@ static int htcpld_set_type(unsigned int irq, unsigned int flags) }static struct irq_chip htcpld_muxed_chip = { - .name ="htcpld" , - .mask = htcpld_mask, - .unmask = htcpld_unmask, - .set_type = htcpld_set_type, + .name ="htcpld" , + .irq_mask = htcpld_mask, + .irq_unmask = htcpld_unmask, + .irq_set_type = htcpld_set_type, };/* To properly dispatch IRQ events, we need to read from the
Signature · 1 line
1.7.1
PATCH 8/20 mfd: jz4740-adc: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/jz4740-adc.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-)
drivers/mfd/jz4740-adc.c +13 -12
@@ -84,31 +84,32 @@ static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq,spin_unlock_irqrestore (&adc->lock, flags); } -static void jz4740_adc_irq_mask (unsigned int irq) +static void jz4740_adc_irq_mask (struct irq_data *d) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, true); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (d); +jz4740_adc_irq_set_masked (adc, d->irq, true); } -static void jz4740_adc_irq_unmask (unsigned int irq) +static void jz4740_adc_irq_unmask (struct irq_data *d) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, false); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (d); +jz4740_adc_irq_set_masked (adc, d->irq, false); } -static void jz4740_adc_irq_ack (unsigned int irq) +static void jz4740_adc_irq_ack (struct irq_data *d) { -struct jz4740_adc *adc =get_irq_chip_data (irq); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (d); +unsigned int irq; - irq -= adc->irq_base; + irq = d->irq - adc->irq_base;writeb (BIT (irq), adc->base +JZ_REG_ADC_STATUS ); }static struct irq_chip jz4740_adc_irq_chip = { .name ="jz4740-adc" , - .mask = jz4740_adc_irq_mask, - .unmask = jz4740_adc_irq_unmask, - .ack = jz4740_adc_irq_ack, + .irq_mask = jz4740_adc_irq_mask, + .irq_unmask = jz4740_adc_irq_unmask, + .irq_ack = jz4740_adc_irq_ack, };static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc)
Signature · 1 line
1.7.1
Re: [PATCH 08/20] mfd: jz4740-adc: irq_data conversion.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi
There was already a similar patch yesterday:
https://lkml.org/lkml/2010/12/12/111
Thanks,
- - Lars
Quoted 44 lines · Lennert Buytenhek
Signed-off-by Lennert Buytenhek <[email protected]>--- drivers/mfd/jz4740-adc.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-)drivers/mfd/jz4740-adc.c +10
-9@@ -84,31 +84,32 @@ static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq,spin_unlock_irqrestore (&adc->lock, flags); } -static void jz4740_adc_irq_mask (unsigned int irq) +static void jz4740_adc_irq_mask (struct irq_data *d) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, true); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (d); +jz4740_adc_irq_set_masked (adc, d->irq, true); } -static void jz4740_adc_irq_unmask (unsigned int irq) +static void jz4740_adc_irq_unmask (struct irq_data *d) { -struct jz4740_adc *adc =get_irq_chip_data (irq); -jz4740_adc_irq_set_masked (adc, irq, false); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (d); +jz4740_adc_irq_set_masked (adc, d->irq, false); } -static void jz4740_adc_irq_ack (unsigned int irq) +static void jz4740_adc_irq_ack (struct irq_data *d) { -struct jz4740_adc *adc =get_irq_chip_data (irq); +struct jz4740_adc *adc =irq_data_get_irq_chip_data (d); +unsigned int irq; - irq -= adc->irq_base; + irq = d->irq - adc->irq_base;writeb (BIT (irq), adc->base +JZ_REG_ADC_STATUS ); }static struct irq_chip jz4740_adc_irq_chip = {
drivers/mfd/jz4740-adc.c static inline void jz4740_adc_irq_set_masked(struct jz4740_adc *adc, int irq, · line 115
Quoted 10 lines
drivers/mfd/jz4740-adc.c +3
-3.name = "jz4740-adc", - .mask = jz4740_adc_irq_mask, - .unmask = jz4740_adc_irq_unmask, - .ack = jz4740_adc_irq_ack, + .irq_mask = jz4740_adc_irq_mask, + .irq_unmask = jz4740_adc_irq_unmask, + .irq_ack = jz4740_adc_irq_ack, };static void jz4740_adc_irq_demux (unsigned int irq,struct irq_desc *desc)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk0Ghf8ACgkQBX4mSR26RiMr4ACeJpqumfCY2TOrQQRTNVW7atwn yJAAn37a/pAJl/Gih1quoNuI+tgtje9z
=QOer
-----END PGP SIGNATURE-----
PATCH 9/20 mfd: max8925: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/max8925-core.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
drivers/mfd/max8925-core.c +16 -16
@@ -407,16 +407,16 @@ static irqreturn_t max8925_tsc_irq(int irq, void *data)return IRQ_HANDLED ; } -static void max8925_irq_lock (unsigned int irq) +static void max8925_irq_lock (struct irq_data *d) { -struct max8925_chip *chip =get_irq_chip_data (irq); +struct max8925_chip *chip =irq_data_get_irq_chip_data (d);mutex_lock (&chip->irq_lock); } -static void max8925_irq_sync_unlock (unsigned int irq) +static void max8925_irq_sync_unlock (struct irq_data *d) { -struct max8925_chip *chip =get_irq_chip_data (irq); +struct max8925_chip *chip =irq_data_get_irq_chip_data (d);struct max8925_irq_data *irq_data;static unsigned char cache_chg[2 ] = {0xff ,0xff };static unsigned char cache_on[2 ] = {0xff ,0xff };
@@ -492,25 +492,25 @@ static void max8925_irq_sync_unlock(unsigned int irq)mutex_unlock (&chip->irq_lock); } -static void max8925_irq_enable (unsigned int irq) +static void max8925_irq_enable (struct irq_data *d) { -struct max8925_chip *chip =get_irq_chip_data (irq); - max8925_irqs[irq - chip->irq_base].enable - = max8925_irqs[irq - chip->irq_base].offs; +struct max8925_chip *chip =irq_data_get_irq_chip_data (d); + max8925_irqs[d->irq - chip->irq_base].enable + = max8925_irqs[d->irq - chip->irq_base].offs; } -static void max8925_irq_disable (unsigned int irq) +static void max8925_irq_disable (struct irq_data *d) { -struct max8925_chip *chip =get_irq_chip_data (irq); - max8925_irqs[irq - chip->irq_base].enable =0 ; +struct max8925_chip *chip =irq_data_get_irq_chip_data (d); + max8925_irqs[d->irq - chip->irq_base].enable =0 ; }static struct irq_chip max8925_irq_chip = { - .name ="max8925" , - .bus_lock = max8925_irq_lock, - .bus_sync_unlock = max8925_irq_sync_unlock, - .enable = max8925_irq_enable, - .disable = max8925_irq_disable, + .name ="max8925" , + .irq_bus_lock = max8925_irq_lock, + .irq_bus_sync_unlock = max8925_irq_sync_unlock, + .irq_enable = max8925_irq_enable, + .irq_disable = max8925_irq_disable, }; static int max8925_irq_init(struct max8925_chip *chip, int irq,
Signature · 1 line
1.7.1
PATCH 10/20 mfd: max8998: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/max8998-irq.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/mfd/max8998-irq.c +14 -14
@@ -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)
Signature · 1 line
1.7.1
Re: [PATCH 10/20] mfd: max8998: irq_data conversion.
Quoted 78 lines · Lennert Buytenhek
Signed-off-by Lennert Buytenhek <[email protected]>---
drivers/mfd/max8998-irq.c | 28 ++++++++++++++--------------1 files changed, 14 insertions(+), 14 deletions(-)drivers/mfd/max8998-irq.c +14
-15@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
PATCH 11/20 mfd: stmpe: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/stmpe.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/mfd/stmpe.c +14 -14
@@ -699,16 +699,16 @@ static irqreturn_t stmpe_irq(int irq, void *data)return IRQ_HANDLED ; } -static void stmpe_irq_lock (unsigned int irq) +static void stmpe_irq_lock (struct irq_data *d) { -struct stmpe *stmpe =get_irq_chip_data (irq); +struct stmpe *stmpe =irq_data_get_irq_chip_data (d);mutex_lock (&stmpe->irq_lock); } -static void stmpe_irq_sync_unlock (unsigned int irq) +static void stmpe_irq_sync_unlock (struct irq_data *d) { -struct stmpe *stmpe =get_irq_chip_data (irq); +struct stmpe *stmpe =irq_data_get_irq_chip_data (d);struct stmpe_variant_info *variant = stmpe->variant;int num =DIV_ROUND_UP (variant->num_irqs,8 );int i;
@@ -727,20 +727,20 @@ static void stmpe_irq_sync_unlock(unsigned int irq)mutex_unlock (&stmpe->irq_lock); } -static void stmpe_irq_mask (unsigned int irq) +static void stmpe_irq_mask (struct irq_data *d) { -struct stmpe *stmpe =get_irq_chip_data (irq); -int offset = irq - stmpe->irq_base; +struct stmpe *stmpe =irq_data_get_irq_chip_data (d); +int offset = d->irq - stmpe->irq_base;int regoffset = offset /8 ;int mask =1 << (offset %8 ); stmpe->ier[regoffset] &= ~mask; } -static void stmpe_irq_unmask (unsigned int irq) +static void stmpe_irq_unmask (struct irq_data *d) { -struct stmpe *stmpe =get_irq_chip_data (irq); -int offset = irq - stmpe->irq_base; +struct stmpe *stmpe =irq_data_get_irq_chip_data (d); +int offset = d->irq - stmpe->irq_base;int regoffset = offset /8 ;int mask =1 << (offset %8 );
@@ -749,10 +749,10 @@ static void stmpe_irq_unmask(unsigned int irq)static struct irq_chip stmpe_irq_chip = { .name ="stmpe" , - .bus_lock = stmpe_irq_lock, - .bus_sync_unlock = stmpe_irq_sync_unlock, - .mask = stmpe_irq_mask, - .unmask = stmpe_irq_unmask, + .irq_bus_lock = stmpe_irq_lock, + .irq_bus_sync_unlock = stmpe_irq_sync_unlock, + .irq_mask = stmpe_irq_mask, + .irq_unmask = stmpe_irq_unmask, };static int __devinit stmpe_irq_init (struct stmpe *stmpe)
Signature · 1 line
1.7.1
Re: [PATCH 11/20] mfd: stmpe: irq_data conversion.
Quoted 4 lines · Lennert Buytenhek
Signed-off-by Lennert Buytenhek <[email protected]>--- drivers/mfd/stmpe.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
Thanks, but Mark Brown already sent in similar patches to convert this driver and mfd/tc35892.c.
PATCH 12/20 mfd: t7l66xb: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/t7l66xb.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/mfd/t7l66xb.c +11 -11
@@ -199,37 +199,37 @@ static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)generic_handle_irq (irq_base + i); } -static void t7l66xb_irq_mask (unsigned int irq) +static void t7l66xb_irq_mask (struct irq_data *d) { -struct t7l66xb *t7l66xb =get_irq_chip_data (irq); -unsigned long flags; +struct t7l66xb *t7l66xb =irq_data_get_irq_chip_data (d); +unsigned long flags;u8 imr;spin_lock_irqsave (&t7l66xb->lock, flags); imr =tmio_ioread8 (t7l66xb->scr +SCR_IMR ); - imr |=1 << (irq - t7l66xb->irq_base); + imr |=1 << (d->irq - t7l66xb->irq_base);tmio_iowrite8 (imr, t7l66xb->scr +SCR_IMR );spin_unlock_irqrestore (&t7l66xb->lock, flags); } -static void t7l66xb_irq_unmask (unsigned int irq) +static void t7l66xb_irq_unmask (struct irq_data *d) { -struct t7l66xb *t7l66xb =get_irq_chip_data (irq); +struct t7l66xb *t7l66xb =irq_data_get_irq_chip_data (d);unsigned long flags;u8 imr;spin_lock_irqsave (&t7l66xb->lock, flags); imr =tmio_ioread8 (t7l66xb->scr +SCR_IMR ); - imr &= ~(1 << (irq - t7l66xb->irq_base)); + imr &= ~(1 << (d->irq - t7l66xb->irq_base));tmio_iowrite8 (imr, t7l66xb->scr +SCR_IMR );spin_unlock_irqrestore (&t7l66xb->lock, flags); }static struct irq_chip t7l66xb_chip = { - .name ="t7l66xb" , - .ack = t7l66xb_irq_mask, - .mask = t7l66xb_irq_mask, - .unmask = t7l66xb_irq_unmask, + .name ="t7l66xb" , + .irq_ack = t7l66xb_irq_mask, + .irq_mask = t7l66xb_irq_mask, + .irq_unmask = t7l66xb_irq_unmask, };/*--------------------------------------------------------------------------*/
Signature · 1 line
1.7.1
PATCH 13/20 mfd: tc35892: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/tc35892.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/mfd/tc35892.c +4 -4
@@ -163,15 +163,15 @@ static irqreturn_t tc35892_irq(int irq, void *data)return IRQ_HANDLED ; } -static void tc35892_irq_dummy (unsigned int irq) +static void tc35892_irq_dummy (struct irq_data *d) {/* No mask/unmask at this level */ }static struct irq_chip tc35892_irq_chip = { - .name ="tc35892" , - .mask = tc35892_irq_dummy, - .unmask = tc35892_irq_dummy, + .name ="tc35892" , + .irq_mask = tc35892_irq_dummy, + .irq_unmask = tc35892_irq_dummy, };static int tc35892_irq_init (struct tc35892 *tc35892)
Signature · 1 line
1.7.1
PATCH 14/20 mfd: tc6393xb: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/tc6393xb.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
drivers/mfd/tc6393xb.c +11 -11
@@ -527,41 +527,41 @@ tc6393xb_irq(unsigned int irq, struct irq_desc *desc) } } -static void tc6393xb_irq_ack (unsigned int irq) +static void tc6393xb_irq_ack (struct irq_data *d) { } -static void tc6393xb_irq_mask (unsigned int irq) +static void tc6393xb_irq_mask (struct irq_data *d) { -struct tc6393xb *tc6393xb =get_irq_chip_data (irq); +struct tc6393xb *tc6393xb =irq_data_get_irq_chip_data (d);unsigned long flags;u8 imr;spin_lock_irqsave (&tc6393xb->lock, flags); imr =tmio_ioread8 (tc6393xb->scr +SCR_IMR ); - imr |=1 << (irq - tc6393xb->irq_base); + imr |=1 << (d->irq - tc6393xb->irq_base);tmio_iowrite8 (imr, tc6393xb->scr +SCR_IMR );spin_unlock_irqrestore (&tc6393xb->lock, flags); } -static void tc6393xb_irq_unmask (unsigned int irq) +static void tc6393xb_irq_unmask (struct irq_data *d) { -struct tc6393xb *tc6393xb =get_irq_chip_data (irq); +struct tc6393xb *tc6393xb =irq_data_get_irq_chip_data (d);unsigned long flags;u8 imr;spin_lock_irqsave (&tc6393xb->lock, flags); imr =tmio_ioread8 (tc6393xb->scr +SCR_IMR ); - imr &= ~(1 << (irq - tc6393xb->irq_base)); + imr &= ~(1 << (d->irq - tc6393xb->irq_base));tmio_iowrite8 (imr, tc6393xb->scr +SCR_IMR );spin_unlock_irqrestore (&tc6393xb->lock, flags); }static struct irq_chip tc6393xb_chip = { - .name ="tc6393xb" , - .ack = tc6393xb_irq_ack, - .mask = tc6393xb_irq_mask, - .unmask = tc6393xb_irq_unmask, + .name ="tc6393xb" , + .irq_ack = tc6393xb_irq_ack, + .irq_mask = tc6393xb_irq_mask, + .irq_unmask = tc6393xb_irq_unmask, };static void tc6393xb_attach_irq (struct platform_device *dev)
Signature · 1 line
1.7.1
PATCH 15/20 mfd: tps6586x: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/tps6586x.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/mfd/tps6586x.c +14 -14
@@ -325,37 +325,37 @@ static int tps6586x_remove_subdevs(struct tps6586x *tps6586x)return device_for_each_child (tps6586x->dev,NULL , __remove_subdev); } -static void tps6586x_irq_lock (unsigned int irq) +static void tps6586x_irq_lock (struct irq_data *d) { -struct tps6586x *tps6586x =get_irq_chip_data (irq); +struct tps6586x *tps6586x =irq_data_get_irq_chip_data (d);mutex_lock (&tps6586x->irq_lock); } -static void tps6586x_irq_enable (unsigned int irq) +static void tps6586x_irq_enable (struct irq_data *d) { -struct tps6586x *tps6586x =get_irq_chip_data (irq); -unsigned int __irq = irq - tps6586x->irq_base; +struct tps6586x *tps6586x =irq_data_get_irq_chip_data (d); +unsigned int __irq = d->irq - tps6586x->irq_base;const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq]; tps6586x->mask_reg[data->mask_reg] &= ~data->mask_mask; tps6586x->irq_en |= (1 << __irq); } -static void tps6586x_irq_disable (unsigned int irq) +static void tps6586x_irq_disable (struct irq_data *d) { -struct tps6586x *tps6586x =get_irq_chip_data (irq); +struct tps6586x *tps6586x =irq_data_get_irq_chip_data (d); -unsigned int __irq = irq - tps6586x->irq_base; +unsigned int __irq = d->irq - tps6586x->irq_base;const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq]; tps6586x->mask_reg[data->mask_reg] |= data->mask_mask; tps6586x->irq_en &= ~(1 << __irq); } -static void tps6586x_irq_sync_unlock (unsigned int irq) +static void tps6586x_irq_sync_unlock (struct irq_data *d) { -struct tps6586x *tps6586x =get_irq_chip_data (irq); +struct tps6586x *tps6586x =irq_data_get_irq_chip_data (d);int i;for (i =0 ; i <ARRAY_SIZE (tps6586x->mask_reg); i++) {
@@ -421,10 +421,10 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq, tps6586x->irq_base = irq_base; tps6586x->irq_chip.name ="tps6586x" ; - tps6586x->irq_chip.enable = tps6586x_irq_enable; - tps6586x->irq_chip.disable = tps6586x_irq_disable; - tps6586x->irq_chip.bus_lock = tps6586x_irq_lock; - tps6586x->irq_chip.bus_sync_unlock = tps6586x_irq_sync_unlock; + tps6586x->irq_chip.irq_enable = tps6586x_irq_enable; + tps6586x->irq_chip.irq_disable = tps6586x_irq_disable; + tps6586x->irq_chip.irq_bus_lock = tps6586x_irq_lock; + tps6586x->irq_chip.irq_bus_sync_unlock = tps6586x_irq_sync_unlock;for (i =0 ; i <ARRAY_SIZE (tps6586x_irqs); i++) {int __irq = i + tps6586x->irq_base;
Signature · 1 line
1.7.1
Re: [PATCH 15/20] mfd: tps6586x: irq_data conversion.
Quoted 4 lines · Lennert Buytenhek
Signed-off-by Lennert Buytenhek <[email protected]>--- drivers/mfd/tps6586x.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
Mark Brown has already sent similar patch: :)
https://lkml.org/lkml/2010/12/12/51
Quoted 67 lines
drivers/mfd/tps6586x.c +14
-14@@ -325,37 +325,37 @@ static int tps6586x_remove_subdevs(struct tps6586x *tps6586x)return device_for_each_child (tps6586x->dev,NULL , __remove_subdev); } -static void tps6586x_irq_lock (unsigned int irq) +static void tps6586x_irq_lock (struct irq_data *d) { -struct tps6586x *tps6586x =get_irq_chip_data (irq); +struct tps6586x *tps6586x =irq_data_get_irq_chip_data (d);mutex_lock (&tps6586x->irq_lock); } -static void tps6586x_irq_enable (unsigned int irq) +static void tps6586x_irq_enable (struct irq_data *d) { -struct tps6586x *tps6586x =get_irq_chip_data (irq); -unsigned int __irq = irq - tps6586x->irq_base; +struct tps6586x *tps6586x =irq_data_get_irq_chip_data (d); +unsigned int __irq = d->irq - tps6586x->irq_base;const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq]; tps6586x->mask_reg[data->mask_reg] &= ~data->mask_mask; tps6586x->irq_en |= (1 << __irq); } -static void tps6586x_irq_disable (unsigned int irq) +static void tps6586x_irq_disable (struct irq_data *d) { -struct tps6586x *tps6586x =get_irq_chip_data (irq); +struct tps6586x *tps6586x =irq_data_get_irq_chip_data (d); -unsigned int __irq = irq - tps6586x->irq_base; +unsigned int __irq = d->irq - tps6586x->irq_base;const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq]; tps6586x->mask_reg[data->mask_reg] |= data->mask_mask; tps6586x->irq_en &= ~(1 << __irq); } -static void tps6586x_irq_sync_unlock (unsigned int irq) +static void tps6586x_irq_sync_unlock (struct irq_data *d) { -struct tps6586x *tps6586x =get_irq_chip_data (irq); +struct tps6586x *tps6586x =irq_data_get_irq_chip_data (d);int i;for (i =0 ; i <ARRAY_SIZE (tps6586x->mask_reg); i++) {@@ -421,10 +421,10 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq, tps6586x->irq_base = irq_base; tps6586x->irq_chip.name ="tps6586x" ; - tps6586x->irq_chip.enable = tps6586x_irq_enable; - tps6586x->irq_chip.disable = tps6586x_irq_disable; - tps6586x->irq_chip.bus_lock = tps6586x_irq_lock; - tps6586x->irq_chip.bus_sync_unlock = tps6586x_irq_sync_unlock; + tps6586x->irq_chip.irq_enable = tps6586x_irq_enable; + tps6586x->irq_chip.irq_disable = tps6586x_irq_disable; + tps6586x->irq_chip.irq_bus_lock = tps6586x_irq_lock; + tps6586x->irq_chip.irq_bus_sync_unlock = tps6586x_irq_sync_unlock;for (i =0 ; i <ARRAY_SIZE (tps6586x_irqs); i++) {int __irq = i + tps6586x->irq_base;
Signature · 2 lines
Sincerely yours, Mike.
PATCH 16/20 mfd: twl4030: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/twl4030-irq.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/mfd/twl4030-irq.c +14 -14
@@ -599,38 +599,38 @@ static void twl4030_sih_do_edge(struct work_struct *work)* completion, potentially including some re-ordering, of these requests. */ -static void twl4030_sih_mask (unsigned irq) +static void twl4030_sih_mask (struct irq_data *d) { -struct sih_agent *sih =get_irq_chip_data (irq); +struct sih_agent *sih =irq_data_get_irq_chip_data (d);unsigned long flags;spin_lock_irqsave (&sih_agent_lock, flags); - sih->imr |=BIT (irq - sih->irq_base); + sih->imr |=BIT (d->irq - sih->irq_base); sih->imr_change_pending = true;queue_work (wq, &sih->mask_work);spin_unlock_irqrestore (&sih_agent_lock, flags); } -static void twl4030_sih_unmask (unsigned irq) +static void twl4030_sih_unmask (struct irq_data *d) { -struct sih_agent *sih =get_irq_chip_data (irq); +struct sih_agent *sih =irq_data_get_irq_chip_data (d);unsigned long flags;spin_lock_irqsave (&sih_agent_lock, flags); - sih->imr &= ~BIT (irq - sih->irq_base); + sih->imr &= ~BIT (d->irq - sih->irq_base); sih->imr_change_pending = true;queue_work (wq, &sih->mask_work);spin_unlock_irqrestore (&sih_agent_lock, flags); } -static int twl4030_sih_set_type (unsigned irq,unsigned trigger) +static int twl4030_sih_set_type (struct irq_data *d,unsigned trigger) { -struct sih_agent *sih =get_irq_chip_data (irq); -struct irq_desc *desc =irq_to_desc (irq); +struct sih_agent *sih =irq_data_get_irq_chip_data (d); +struct irq_desc *desc =irq_to_desc (d->irq);unsigned long flags;if (!desc) { -pr_err ("twl4030: Invalid IRQ: %d\n" , irq); +pr_err ("twl4030: Invalid IRQ: %d\n" , d->irq);return -EINVAL ; }
@@ -641,7 +641,7 @@ static int twl4030_sih_set_type(unsigned irq, unsigned trigger)if ((desc->status &IRQ_TYPE_SENSE_MASK ) != trigger) { desc->status &= ~IRQ_TYPE_SENSE_MASK ; desc->status |= trigger; - sih->edge_change |=BIT (irq - sih->irq_base); + sih->edge_change |=BIT (d->irq - sih->irq_base);queue_work (wq, &sih->edge_work); }spin_unlock_irqrestore (&sih_agent_lock, flags);
@@ -650,9 +650,9 @@ static int twl4030_sih_set_type(unsigned irq, unsigned trigger)static struct irq_chip twl4030_sih_irq_chip = { .name ="twl4030" , - .mask = twl4030_sih_mask, - .unmask = twl4030_sih_unmask, - .set_type = twl4030_sih_set_type, + .irq_mask = twl4030_sih_mask, + .irq_unmask = twl4030_sih_unmask, + .irq_set_type = twl4030_sih_set_type, };/*----------------------------------------------------------------------*/
Signature · 1 line
1.7.1
PATCH 17/20 mfd: twl6030: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/twl6030-irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mfd/twl6030-irq.c +1 -1
@@ -325,7 +325,7 @@ int twl6030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end)*/ twl6030_irq_chip = dummy_irq_chip; twl6030_irq_chip.name ="twl6030" ; - twl6030_irq_chip.set_type =NULL ; + twl6030_irq_chip.irq_set_type =NULL ;for (i = irq_base; i < irq_end; i++) { set_irq_chip_and_handler(i, &twl6030_irq_chip,
Signature · 1 line
1.7.1
RE: [PATCH 17/20] mfd: twl6030: irq_data conversion.
Quoted 8 lines
-----Original Message-----
From: Lennert Buytenhek [mailto:[email protected]]
Sent: Monday, December 13, 2010 6:01 PM
To: Balaji T K; Rajendra Nayak; Santosh Shilimkar
Cc: Samuel Ortiz; [email protected]
Subject: [PATCH 17/20] mfd: twl6030:irq_dataconversion.Signed-off-by Lennert Buytenhek <[email protected]>
Quoted 20 lines
--- drivers/mfd/twl6030-irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/mfd/twl6030-irq.c +1
-1@@ -325,7 +325,7 @@ int twl6030_init_irq(int irq_num, unsigned irq_base,unsigned irq_end) */ twl6030_irq_chip = dummy_irq_chip; twl6030_irq_chip.name ="twl6030" ; - twl6030_irq_chip.set_type =NULL ; + twl6030_irq_chip.irq_set_type =NULL ;for (i = irq_base; i < irq_end; i++) {set_irq_chip_and_handler(i,
&twl6030_irq_chip,
--
1.7.1
Re: [PATCH 17/20] mfd: twl6030: irq_data conversion.
In reply to Lennert BuytenhekHi Lennert,
Quoted 4 lines · Lennert Buytenhek
Signed-off-by Lennert Buytenhek <[email protected]>--- drivers/mfd/twl6030-irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Thanks a lot, patch applied.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH 18/20 mfd: wm831x: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/wm831x-irq.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-)
drivers/mfd/wm831x-irq.c +19 -18
@@ -345,16 +345,16 @@ static inline struct wm831x_irq_data *irq_to_wm831x_irq(struct wm831x *wm831x,return &wm831x_irqs[irq - wm831x->irq_base]; } -static void wm831x_irq_lock (unsigned int irq) +static void wm831x_irq_lock (struct irq_data *d) { -struct wm831x *wm831x =get_irq_chip_data (irq); +struct wm831x *wm831x =irq_data_get_irq_chip_data (d);mutex_lock (&wm831x->irq_lock); } -static void wm831x_irq_sync_unlock (unsigned int irq) +static void wm831x_irq_sync_unlock (struct irq_data *d) { -struct wm831x *wm831x =get_irq_chip_data (irq); +struct wm831x *wm831x =irq_data_get_irq_chip_data (d);int i;for (i =0 ; i <ARRAY_SIZE (wm831x->irq_masks_cur); i++) {
@@ -371,28 +371,29 @@ static void wm831x_irq_sync_unlock(unsigned int irq)mutex_unlock (&wm831x->irq_lock); } -static void wm831x_irq_unmask (unsigned int irq) +static void wm831x_irq_unmask (struct irq_data *d) { -struct wm831x *wm831x =get_irq_chip_data (irq); -struct wm831x_irq_data *irq_data =irq_to_wm831x_irq (wm831x, irq); +struct wm831x *wm831x =irq_data_get_irq_chip_data (d); +struct wm831x_irq_data *irq_data =irq_to_wm831x_irq (wm831x, d->irq); wm831x->irq_masks_cur[irq_data->reg -1 ] &= ~irq_data->mask; } -static void wm831x_irq_mask (unsigned int irq) +static void wm831x_irq_mask (struct irq_data *d) { -struct wm831x *wm831x =get_irq_chip_data (irq); -struct wm831x_irq_data *irq_data =irq_to_wm831x_irq (wm831x, irq); +struct wm831x *wm831x =irq_data_get_irq_chip_data (d); +struct wm831x_irq_data *irq_data =irq_to_wm831x_irq (wm831x, d->irq); wm831x->irq_masks_cur[irq_data->reg -1 ] |= irq_data->mask; } -static int wm831x_irq_set_type (unsigned int irq,unsigned int type) +static int wm831x_irq_set_type (struct irq_data *d,unsigned int type) { -struct wm831x *wm831x =get_irq_chip_data (irq); +struct wm831x *wm831x =irq_data_get_irq_chip_data (irq); +unsigned int irq;int val; - irq = irq - wm831x->irq_base; + irq = d->irq - wm831x->irq_base;if (irq <WM831X_IRQ_GPIO_1 || irq >WM831X_IRQ_GPIO_11 ) {/* Ignore internal-only IRQs */
@@ -422,11 +423,11 @@ static int wm831x_irq_set_type(unsigned int irq, unsigned int type)static struct irq_chip wm831x_irq_chip = { .name ="wm831x" , - .bus_lock = wm831x_irq_lock, - .bus_sync_unlock = wm831x_irq_sync_unlock, - .mask = wm831x_irq_mask, - .unmask = wm831x_irq_unmask, - .set_type = wm831x_irq_set_type, + .irq_bus_lock = wm831x_irq_lock, + .irq_bus_sync_unlock = wm831x_irq_sync_unlock, + .irq_mask = wm831x_irq_mask, + .irq_unmask = wm831x_irq_unmask, + .irq_set_type = wm831x_irq_set_type, };/* The processing of the primary interrupt occurs in a thread so that
Signature · 1 line
1.7.1
Re: [PATCH 18/20] mfd: wm831x: irq_data conversion.
Quoted 1 line · Lennert Buytenhek
Signed-off-by Lennert Buytenhek <[email protected]>
If you're doing this sort of work you really need to work against -next or the individual development tree rather than Linus' tree. The Wolfson drivers have been converted in -next for a while now.
I also posted patches for everything in MFD except ezx-pcap over the weekend - I pushed a branch up to a git tree earlier today with these changes in, I'll try to keep it up to date with the acks I'm getting. I'll add Lennart's ezx-pcap patch to that.
The following changes since commit 3ec93fcb34a97a9806a7280b136a7af20edf61f1:
mfd: Fix twl_probe section mismatch warning in mfd/twl-core.c (2010-12-10 20:59:59 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc-2.6.git mfd-irq
Mark Brown (20):
mfd: Staticise unexported symbols in ASIC3
mfd: Correct ASIC3 IRQ_OWM resource setup
mfd: Remove ARCH_U8500 dependency from AB8500
mfd: Staticise internal functions in HTC I2CCPLD driver
mfd: Convert 88PM860x driver to new irq_ APIs
mfd: Convert ASIC3 to new irq_ APIs
mfd: Convert AB3500 to new irq_ APIs
mfd: Convert AB8500 to new irq_ methods
mfd: Convert HTC EGPIO driver to irq_ API
mfd: Convert HTC I2C CPLD driver to irq_ API
mfd: Convert jz4740-adc to new irq_ methods
mfd: Convert max8925 to new irq_ API
mfd: Convert MAX8998 driver to irq_ API
mfd: Convert SMTPE driver to new irq_ APIs
mfd: Convert t7166xb driver to new irq_ API
mfd: Convert tc35892 to new irq_ APIs
mfd: Convert tc6393xb driver to new irq_ APIs
mfd: Convert tps6586x driver to new irq_ API
mfd: Convert TWL4030 to new irq_ APIs
mfd: Convert Wolfson MFD drivers to use irq_data accessor function
drivers/mfd/88pm860x-core.c | 36 ++++++++++-------------- drivers/mfd/Kconfig | 2 +- drivers/mfd/ab3550-core.c | 28 +++++++++---------- drivers/mfd/ab8500-core.c | 28 +++++++++--------- drivers/mfd/asic3.c | 62 +++++++++++++++++++++--------------------- drivers/mfd/htc-egpio.c | 27 +++++++++--------- drivers/mfd/htc-i2cpld.c | 40 ++++++++++++++-------------- drivers/mfd/jz4740-adc.c | 25 ++++++++--------- drivers/mfd/max8925-core.c | 30 ++++++++++---------- drivers/mfd/max8998-irq.c | 30 +++++++++++--------- drivers/mfd/stmpe.c | 28 +++++++++--------- drivers/mfd/t7l66xb.c | 20 +++++++------- drivers/mfd/tc35892.c | 8 +++--- drivers/mfd/tc6393xb.c | 22 +++++++------- drivers/mfd/tps6586x.c | 28 +++++++++--------- drivers/mfd/twl4030-irq.c | 28 +++++++++--------- drivers/mfd/wm831x-irq.c | 10 +++--- drivers/mfd/wm8350-irq.c | 8 +++--- drivers/mfd/wm8994-irq.c | 8 +++--- 19 files changed, 231 insertions(+), 237 deletions(-)
Re: [PATCH 18/20] mfd: wm831x: irq_data conversion.
Quoted 4 lines · Mark Brown
I also posted patches for everything in MFD except ezx-pcap over the weekend - I pushed a branch up to a git tree earlier today with these changes in, I'll try to keep it up to date with the acks I'm getting. I'll add Lennart's ezx-pcap patch to that.
Alright, I'll drop my series.
Re: [PATCH 18/20] mfd: wm831x: irq_data conversion.
In reply to Mark BrownHi Mark,
Quoted 12 lines · Mark Brown
Quoted 1 line · Lennert Buytenhek
Signed-off-by Lennert Buytenhek <[email protected]>If you're doing this sort of work you really need to work against -next or the individual development tree rather than Linus' tree. The Wolfson drivers have been converted in -next for a while now.
I also posted patches for everything in MFD except ezx-pcap over the weekend - I pushed a branch up to a git tree earlier today with these changes in, I'll try to keep it up to date with the acks I'm getting. I'll add Lennart's ezx-pcap patch to that.
Quoted 6 lines
The following changes since commit
3ec93fcb34a97a9806a7280b136a7af20edf61f1:mfd: Fix
twl_probesection mismatch warning inmfd/twl-core.c(2010-12-10 20:59:59 +0100)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc-2.6.gitmfd-irq
I've pulled this one into my for-next branch.
Big thanks for taking care of this, I appreciate.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
PATCH 19/20 mfd: wm8350: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/wm8350-irq.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/mfd/wm8350-irq.c +14 -14
@@ -417,16 +417,16 @@ static irqreturn_t wm8350_irq(int irq, void *irq_data)return IRQ_HANDLED ; } -static void wm8350_irq_lock (unsigned int irq) +static void wm8350_irq_lock (struct irq_data *d) { -struct wm8350 *wm8350 =get_irq_chip_data (irq); +struct wm8350 *wm8350 =irq_data_get_irq_chip_data (d);mutex_lock (&wm8350->irq_lock); } -static void wm8350_irq_sync_unlock (unsigned int irq) +static void wm8350_irq_sync_unlock (struct irq_data *d) { -struct wm8350 *wm8350 =get_irq_chip_data (irq); +struct wm8350 *wm8350 =irq_data_get_irq_chip_data (d);int i;for (i =0 ; i <ARRAY_SIZE (wm8350->irq_masks); i++) {
@@ -442,28 +442,28 @@ static void wm8350_irq_sync_unlock(unsigned int irq)mutex_unlock (&wm8350->irq_lock); } -static void wm8350_irq_enable (unsigned int irq) +static void wm8350_irq_enable (struct irq_data *d) { -struct wm8350 *wm8350 =get_irq_chip_data (irq); -struct wm8350_irq_data *irq_data =irq_to_wm8350_irq (wm8350, irq); +struct wm8350 *wm8350 =irq_data_get_irq_chip_data (d); +struct wm8350_irq_data *irq_data =irq_to_wm8350_irq (wm8350, d->irq); wm8350->irq_masks[irq_data->reg] &= ~irq_data->mask; } -static void wm8350_irq_disable (unsigned int irq) +static void wm8350_irq_disable (struct irq_data *d) { -struct wm8350 *wm8350 =get_irq_chip_data (irq); -struct wm8350_irq_data *irq_data =irq_to_wm8350_irq (wm8350, irq); +struct wm8350 *wm8350 =irq_data_get_irq_chip_data (d); +struct wm8350_irq_data *irq_data =irq_to_wm8350_irq (wm8350, d->irq); wm8350->irq_masks[irq_data->reg] |= irq_data->mask; }static struct irq_chip wm8350_irq_chip = { .name ="wm8350" , - .bus_lock = wm8350_irq_lock, - .bus_sync_unlock = wm8350_irq_sync_unlock, - .disable = wm8350_irq_disable, - .enable = wm8350_irq_enable, + .irq_bus_lock = wm8350_irq_lock, + .irq_bus_sync_unlock = wm8350_irq_sync_unlock, + .irq_disable = wm8350_irq_disable, + .irq_enable = wm8350_irq_enable, }; int wm8350_irq_init(struct wm8350 *wm8350, int irq,
Signature · 1 line
1.7.1
PATCH 20/20 mfd: wm8994: irq_data conversion.
In reply to a message not in the archive--- drivers/mfd/wm8994-irq.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/mfd/wm8994-irq.c +14 -14
@@ -156,16 +156,16 @@ static inline struct wm8994_irq_data *irq_to_wm8994_irq(struct wm8994 *wm8994,return &wm8994_irqs[irq - wm8994->irq_base]; } -static void wm8994_irq_lock (unsigned int irq) +static void wm8994_irq_lock (struct irq_data *d) { -struct wm8994 *wm8994 =get_irq_chip_data (irq); +struct wm8994 *wm8994 =irq_data_get_irq_chip_data (d);mutex_lock (&wm8994->irq_lock); } -static void wm8994_irq_sync_unlock (unsigned int irq) +static void wm8994_irq_sync_unlock (struct irq_data *d) { -struct wm8994 *wm8994 =get_irq_chip_data (irq); +struct wm8994 *wm8994 =irq_data_get_irq_chip_data (d);int i;for (i =0 ; i <ARRAY_SIZE (wm8994->irq_masks_cur); i++) {
@@ -182,28 +182,28 @@ static void wm8994_irq_sync_unlock(unsigned int irq)mutex_unlock (&wm8994->irq_lock); } -static void wm8994_irq_unmask (unsigned int irq) +static void wm8994_irq_unmask (struct irq_data *d) { -struct wm8994 *wm8994 =get_irq_chip_data (irq); -struct wm8994_irq_data *irq_data =irq_to_wm8994_irq (wm8994, irq); +struct wm8994 *wm8994 =irq_data_get_irq_chip_data (d); +struct wm8994_irq_data *irq_data =irq_to_wm8994_irq (wm8994, d->irq); wm8994->irq_masks_cur[irq_data->reg -1 ] &= ~irq_data->mask; } -static void wm8994_irq_mask (unsigned int irq) +static void wm8994_irq_mask (struct irq_data *d) { -struct wm8994 *wm8994 =get_irq_chip_data (irq); -struct wm8994_irq_data *irq_data =irq_to_wm8994_irq (wm8994, irq); +struct wm8994 *wm8994 =irq_data_get_irq_chip_data (d); +struct wm8994_irq_data *irq_data =irq_to_wm8994_irq (wm8994, d->irq); wm8994->irq_masks_cur[irq_data->reg -1 ] |= irq_data->mask; }static struct irq_chip wm8994_irq_chip = { .name ="wm8994" , - .bus_lock = wm8994_irq_lock, - .bus_sync_unlock = wm8994_irq_sync_unlock, - .mask = wm8994_irq_mask, - .unmask = wm8994_irq_unmask, + .irq_bus_lock = wm8994_irq_lock, + .irq_bus_sync_unlock = wm8994_irq_sync_unlock, + .irq_mask = wm8994_irq_mask, + .irq_unmask = wm8994_irq_unmask, };/* The processing of the primary interrupt occurs in a thread so that
Signature · 1 line
1.7.1