Message ID | 1ec46fbd250efe78699a1e4cf6838c0c88f4acc7.1370572420.git.peter.crosthwaite@xilinx.com |
---|---|
State | New |
Headers | show |
email accidentally sent with cc supression, so cc qemu-trivial as intended. On Fri, Jun 7, 2013 at 12:38 PM, <peter.crosthwaite@xilinx.com> wrote: > From: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > > Use qemu_set_irq rather than if-elsing qemu_irq_(lower|raise). No > functional change, just reduces verbosity. > > Cc: qemu-trivial@nongnu.org > > Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > --- > > hw/intc/xilinx_intc.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c > index b106e72..5df7008 100644 > --- a/hw/intc/xilinx_intc.c > +++ b/hw/intc/xilinx_intc.c > @@ -66,11 +66,7 @@ static void update_irq(struct xlx_pic *p) > i = ~0; > > p->regs[R_IVR] = i; > - if ((p->regs[R_MER] & 1) && p->regs[R_IPR]) { > - qemu_irq_raise(p->parent_irq); > - } else { > - qemu_irq_lower(p->parent_irq); > - } > + qemu_set_irq(p->parent_irq, (p->regs[R_MER] & 1) && p->regs[R_IPR]); > } > > static uint64_t > -- > 1.8.3.rc1.44.gb387c77.dirty >
07.06.2013 06:39, Peter Crosthwaite wrote: >> Use qemu_set_irq rather than if-elsing qemu_irq_(lower|raise). No >> functional change, just reduces verbosity. Thanks, applied to the trivial patches queue. /mjt
On Sat, Jun 8, 2013 at 8:36 AM, Michael Tokarev <mjt@tls.msk.ru> wrote: > 07.06.2013 06:39, Peter Crosthwaite wrote: >>> Use qemu_set_irq rather than if-elsing qemu_irq_(lower|raise). No >>> functional change, just reduces verbosity. > > Thanks, applied to the trivial patches queue. > Thanks, I need to respin the later patches in this series but as you have taken this ill drop it from the respin. No conflict issues. Regards, Peter > /mjt >
11.06.2013 04:41, Peter Crosthwaite wrote: > On Sat, Jun 8, 2013 at 8:36 AM, Michael Tokarev <mjt@tls.msk.ru> wrote: >> Thanks, applied to the trivial patches queue. > > I need to respin the later patches in this series but as you have > taken this ill drop it from the respin. No conflict issues. heh. I haven't even noticed this is 1/5 ;) Please don't send just some patches from a series for applying to other trees. Because if you do the respin, at least in some cases you'll have to wait for the applied bits to reach master first... ;) It's as trivial to remove this one from -trivial as to keep it there, it's your call ;) Thanks, /mjt
diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index b106e72..5df7008 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -66,11 +66,7 @@ static void update_irq(struct xlx_pic *p) i = ~0; p->regs[R_IVR] = i; - if ((p->regs[R_MER] & 1) && p->regs[R_IPR]) { - qemu_irq_raise(p->parent_irq); - } else { - qemu_irq_lower(p->parent_irq); - } + qemu_set_irq(p->parent_irq, (p->regs[R_MER] & 1) && p->regs[R_IPR]); } static uint64_t