Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[~andy/linux] / arch / arm / plat-spear / pl080.c

diff --git a/arch/arm/plat-spear/pl080.c b/arch/arm/plat-spear/pl080.c
index 12cf27f935f97372854cc1a0bd2c41251971499f..cfa1199d0f4a86152fddfae9f83d3074c330e3a8 100644 (file)
--- a/arch/arm/plat-spear/pl080.c
+++ b/arch/arm/plat-spear/pl080.c
@@ -27,9 +27,8 @@ struct {
        unsigned char val;
 } signals[16] = {{0, 0}, };
 
-int pl080_get_signal(struct pl08x_dma_chan *ch)
+int pl080_get_signal(const struct pl08x_channel_data *cd)
 {
-       const struct pl08x_channel_data *cd = ch->cd;
        unsigned int signal = cd->min_signal, val;
        unsigned long flags;
 
@@ -63,18 +62,17 @@ int pl080_get_signal(struct pl08x_dma_chan *ch)
        return signal;
 }
 
-void pl080_put_signal(struct pl08x_dma_chan *ch)
+void pl080_put_signal(const struct pl08x_channel_data *cd, int signal)
 {
-       const struct pl08x_channel_data *cd = ch->cd;
        unsigned long flags;
 
        spin_lock_irqsave(&lock, flags);
 
        /* if signal is not used */
-       if (!signals[cd->min_signal].busy)
+       if (!signals[signal].busy)
                BUG();
 
-       signals[cd->min_signal].busy--;
+       signals[signal].busy--;
 
        spin_unlock_irqrestore(&lock, flags);
 }