diff options
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/mbox_channels-db5500.h | 3 | ||||
| -rw-r--r-- | drivers/misc/mbox_channels-db5500.c | 5 | ||||
| -rw-r--r-- | drivers/misc/modem_audio/mad.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-ux500/include/mach/mbox_channels-db5500.h b/arch/arm/mach-ux500/include/mach/mbox_channels-db5500.h index c29dfff0ff7..549a9c2c8cb 100644 --- a/arch/arm/mach-ux500/include/mach/mbox_channels-db5500.h +++ b/arch/arm/mach-ux500/include/mach/mbox_channels-db5500.h @@ -11,6 +11,9 @@ /* Maximum number of datawords which can be send in one PDU */ #define MAILBOX_NR_OF_DATAWORDS 3 +/* Number of buffers */ +#define NUM_DSP_BUFFER 16 + /** * mbox_channel_cb_t - Definition of the mailbox channel callback. * @data: Pointer to the data. diff --git a/drivers/misc/mbox_channels-db5500.c b/drivers/misc/mbox_channels-db5500.c index b3baae12d4b..919be308ed4 100644 --- a/drivers/misc/mbox_channels-db5500.c +++ b/drivers/misc/mbox_channels-db5500.c @@ -51,9 +51,6 @@ /* Returns sequence number from mbox message header */ #define GET_SEQ_NUMBER(mbox_msg) (((mbox_msg) >> 24) -/* Number of buffers */ -#define NUM_DSP_BUFFER 4 - enum mbox_msg{ MBOX_CLOSE, MBOX_OPEN, @@ -379,7 +376,7 @@ rcv_msg: dev_err(&channels.pdev->dev, "%s no callback provided\n", __func__); } - if (!atomic_dec_and_test(&rx_chan->rcv_counter)) + if (atomic_dec_return(&rx_chan->rcv_counter) > 0) goto rcv_msg; } diff --git a/drivers/misc/modem_audio/mad.c b/drivers/misc/modem_audio/mad.c index 88bbcaa3c9c..d31d78ba3f2 100644 --- a/drivers/misc/modem_audio/mad.c +++ b/drivers/misc/modem_audio/mad.c @@ -55,8 +55,8 @@ MODULE_LICENSE("GPLv2"); * Maximum number of datawords which can be sent * in the mailbox each word is 32 bits */ -#define MAX_NR_OF_DATAWORDS 3 -#define MAX_NUM_RX_BUFF 4 +#define MAX_NR_OF_DATAWORDS MAILBOX_NR_OF_DATAWORDS +#define MAX_NUM_RX_BUFF NUM_DSP_BUFFER #define NR_OF_DATAWORDS_REQD_FOR_ACK 1 /** |