Merge tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujitsu/integ...

[sfrench/cifs-2.6.git] / drivers / mailbox / pcc.c

diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 9b7005e1345e1a2b0f76ddc8e429a070d4c65790..3ef7f036ceeaac1eafb5a3b0592c79bfeb37ea7e 100644 (file)
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -69,7 +69,6 @@
 
 #include "mailbox.h"
 
-#define MAX_PCC_SUBSPACES      256
 #define MBOX_IRQ_NAME          "pcc-mbox"
 
 static struct mbox_chan *pcc_mbox_channels;
@@ -266,7 +265,7 @@ struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
        init_completion(&chan->tx_complete);
 
        if (chan->txdone_method == TXDONE_BY_POLL && cl->knows_txdone)
-               chan->txdone_method |= TXDONE_BY_ACK;
+               chan->txdone_method = TXDONE_BY_ACK;
 
        spin_unlock_irqrestore(&chan->lock, flags);
 
@@ -312,7 +311,7 @@ void pcc_mbox_free_channel(struct mbox_chan *chan)
        spin_lock_irqsave(&chan->lock, flags);
        chan->cl = NULL;
        chan->active_req = NULL;
-       if (chan->txdone_method == (TXDONE_BY_POLL | TXDONE_BY_ACK))
+       if (chan->txdone_method == TXDONE_BY_ACK)
                chan->txdone_method = TXDONE_BY_POLL;
 
        spin_unlock_irqrestore(&chan->lock, flags);