Commit eeef1713 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller

ISDN: eicon: switch to use native bitmaps

Two arrays are clearly bit maps, so, make that explicit by converting to
bitmap API and remove custom helpers.

Note sig_ind() uses out of boundary bit to (looks like) protect against
potential bitmap_empty() checks for the same bitmap.

This patch removes that since:
1) that didn't guarantee atomicity anyway;
2) the first operation inside the for-loop is set bit in the bitmap
   (which effectively makes it non-empty);
3) group_optimization() doesn't utilize possible emptiness of the bitmap
   in question.

Thus, if there is a protection needed it should be implemented properly.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b17010d
...@@ -26,15 +26,7 @@ ...@@ -26,15 +26,7 @@
/*#define DEBUG */ /*#define DEBUG */
#include <linux/types.h>
#define IMPLEMENT_DTMF 1 #define IMPLEMENT_DTMF 1
#define IMPLEMENT_LINE_INTERCONNECT2 1 #define IMPLEMENT_LINE_INTERCONNECT2 1
...@@ -82,8 +74,6 @@ ...@@ -82,8 +74,6 @@
#define CODEC_PERMANENT 0x02 #define CODEC_PERMANENT 0x02
#define ADV_VOICE 0x03 #define ADV_VOICE 0x03
#define MAX_CIP_TYPES 5 /* kind of CIP types for group optimization */ #define MAX_CIP_TYPES 5 /* kind of CIP types for group optimization */
#define C_IND_MASK_DWORDS ((MAX_APPL + 32) >> 5)
#define FAX_CONNECT_INFO_BUFFER_SIZE 256 #define FAX_CONNECT_INFO_BUFFER_SIZE 256
#define NCPI_BUFFER_SIZE 256 #define NCPI_BUFFER_SIZE 256
...@@ -265,8 +255,8 @@ struct _PLCI { ...@@ -265,8 +255,8 @@ struct _PLCI {
word ncci_ring_list; word ncci_ring_list;
byte inc_dis_ncci_table[MAX_CHANNELS_PER_PLCI]; byte inc_dis_ncci_table[MAX_CHANNELS_PER_PLCI];
t_std_internal_command internal_command_queue[MAX_INTERNAL_COMMAND_LEVELS]; t_std_internal_command internal_command_queue[MAX_INTERNAL_COMMAND_LEVELS];
dword c_ind_mask_table[C_IND_MASK_DWORDS]; DECLARE_BITMAP(c_ind_mask_table, MAX_APPL);
dword group_optimization_mask_table[C_IND_MASK_DWORDS]; DECLARE_BITMAP(group_optimization_mask_table, MAX_APPL);
byte RBuffer[200]; byte RBuffer[200];
dword msg_in_queue[MSG_IN_QUEUE_SIZE/sizeof(dword)]; dword msg_in_queue[MSG_IN_QUEUE_SIZE/sizeof(dword)];
API_SAVE saved_msg; API_SAVE saved_msg;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment