On Wed, Dec 22, 2010 at 11:13:48PM +0100, Linus Walleij wrote: > Signed-off-by: Linus Walleij <linus.wall...@stericsson.com>
Merged for -next, thanks. g. > --- > drivers/spi/amba-pl022.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c > index 40189c5..91ba23a 100644 > --- a/drivers/spi/amba-pl022.c > +++ b/drivers/spi/amba-pl022.c > @@ -369,7 +369,7 @@ struct pl022 { > struct work_struct pump_messages; > spinlock_t queue_lock; > struct list_head queue; > - int busy; > + bool busy; > int run; > /* Message transfer pump */ > struct tasklet_struct pump_transfers; > @@ -1461,7 +1461,7 @@ static void pump_messages(struct work_struct *work) > /* Lock queue and check for queue work */ > spin_lock_irqsave(&pl022->queue_lock, flags); > if (list_empty(&pl022->queue) || pl022->run == QUEUE_STOPPED) { > - pl022->busy = 0; > + pl022->busy = false; > spin_unlock_irqrestore(&pl022->queue_lock, flags); > return; > } > @@ -1475,7 +1475,7 @@ static void pump_messages(struct work_struct *work) > list_entry(pl022->queue.next, struct spi_message, queue); > > list_del_init(&pl022->cur_msg->queue); > - pl022->busy = 1; > + pl022->busy = true; > spin_unlock_irqrestore(&pl022->queue_lock, flags); > > /* Initial message state */ > @@ -1508,7 +1508,7 @@ static int __init init_queue(struct pl022 *pl022) > spin_lock_init(&pl022->queue_lock); > > pl022->run = QUEUE_STOPPED; > - pl022->busy = 0; > + pl022->busy = false; > > tasklet_init(&pl022->pump_transfers, > pump_transfers, (unsigned long)pl022); > -- > 1.7.3.3 > ------------------------------------------------------------------------------ Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general