Re: [PATCH] xen: Convert genirq namespace

[Konrad Rzeszutek Wilk]

On Fri, Mar 25, 2011 at 02:12:31PM +0000, Ian Campbell wrote:
> Resending with Konrad's correct address in the hopes he'll pick this one
> up too ;-)

Yup. Will care it, along with the other patch for rc1.

> 
> On Fri, 2011-03-25 at 11:31 +0000, Ian Campbell wrote:
> > On Fri, 2011-03-25 at 10:01 +0000, Thomas Gleixner wrote:
> > > Converted with coccinelle.
> > > 
> > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> > 
> > Seems pretty obvious and mechanical...
> > 
> > Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> > 
> > Are you carrying it or shall we?
> > 
> > > ---
> > >  drivers/xen/events.c |   22 +++++++++++-----------
> > >  1 file changed, 11 insertions(+), 11 deletions(-)
> > > 
> > > Index: linux-2.6-tip/drivers/xen/events.c
> > > ===================================================================
> > > --- linux-2.6-tip.orig/drivers/xen/events.c
> > > +++ linux-2.6-tip/drivers/xen/events.c
> > > @@ -122,7 +122,7 @@ static struct irq_chip xen_pirq_chip;
> > >  /* Get info for IRQ */
> > >  static struct irq_info *info_for_irq(unsigned irq)
> > >  {
> > > -	return get_irq_data(irq);
> > > +	return irq_get_handler_data(irq);
> > >  }
> > >  
> > >  /* Constructors for packed IRQ information. */
> > > @@ -403,7 +403,7 @@ static void xen_irq_init(unsigned irq)
> > >  
> > >  	info->type = IRQT_UNBOUND;
> > >  
> > > -	set_irq_data(irq, info);
> > > +	irq_set_handler_data(irq, info);
> > >  
> > >  	list_add_tail(&info->list, &xen_irq_list_head);
> > >  }
> > > @@ -458,11 +458,11 @@ static int __must_check xen_allocate_irq
> > >  
> > >  static void xen_free_irq(unsigned irq)
> > >  {
> > > -	struct irq_info *info = get_irq_data(irq);
> > > +	struct irq_info *info = irq_get_handler_data(irq);
> > >  
> > >  	list_del(&info->list);
> > >  
> > > -	set_irq_data(irq, NULL);
> > > +	irq_set_handler_data(irq, NULL);
> > >  
> > >  	kfree(info);
> > >  
> > > @@ -639,8 +639,8 @@ int xen_bind_pirq_gsi_to_irq(unsigned gs
> > >  	if (irq < 0)
> > >  		goto out;
> > >  
> > > -	set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
> > > -				      handle_level_irq, name);
> > > +	irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_level_irq,
> > > +				      name);
> > >  
> > >  	irq_op.irq = irq;
> > >  	irq_op.vector = 0;
> > > @@ -690,8 +690,8 @@ int xen_bind_pirq_msi_to_irq(struct pci_
> > >  	if (irq == -1)
> > >  		goto out;
> > >  
> > > -	set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
> > > -				      handle_level_irq, name);
> > > +	irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_level_irq,
> > > +				      name);
> > >  
> > >  	xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, 0);
> > >  	ret = irq_set_msi_desc(irq, msidesc);
> > > @@ -772,7 +772,7 @@ int bind_evtchn_to_irq(unsigned int evtc
> > >  		if (irq == -1)
> > >  			goto out;
> > >  
> > > -		set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
> > > +		irq_set_chip_and_handler_name(irq, &xen_dynamic_chip,
> > >  					      handle_fasteoi_irq, "event");
> > >  
> > >  		xen_irq_info_evtchn_init(irq, evtchn);
> > > @@ -799,7 +799,7 @@ static int bind_ipi_to_irq(unsigned int 
> > >  		if (irq < 0)
> > >  			goto out;
> > >  
> > > -		set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
> > > +		irq_set_chip_and_handler_name(irq, &xen_percpu_chip,
> > >  					      handle_percpu_irq, "ipi");
> > >  
> > >  		bind_ipi.vcpu = cpu;
> > > @@ -848,7 +848,7 @@ int bind_virq_to_irq(unsigned int virq, 
> > >  		if (irq == -1)
> > >  			goto out;
> > >  
> > > -		set_irq_chip_and_handler_name(irq, &xen_percpu_chip,
> > > +		irq_set_chip_and_handler_name(irq, &xen_percpu_chip,
> > >  					      handle_percpu_irq, "virq");
> > >  
> > >  		bind_virq.virq = virq;
> > 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/