diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-17 19:23:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-17 19:31:33 -0400 |
commit | 2d09d567127e85dddd027d049196093640025c36 (patch) | |
tree | f62153c726996dad8511e3fe94364682da5abe07 /drivers/isdn | |
parent | a713c3bbb5a6736e673940eb97d9bf2c27aec4c5 (diff) |
isdn: eicon: Fix set-but-unused variables.
The variable 'best_id' is set but unused in
diva_mnt_add_xdi_adapter(). Just kill it off.
Similarly for the variable 'CIP' in connect_req(), 'Number' in
sig_ind(), 'Info' in dtmf_confirmation() mixer_command()
fax_connect_ack_command() fax_edata_ack_command()
rtp_connect_b3_res_command() and rtp_connect_b3_res_command(), and 'a'
in mixer_indication_coefs_set(),
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/hardware/eicon/debug.c | 3 | ||||
-rw-r--r-- | drivers/isdn/hardware/eicon/message.c | 23 |
2 files changed, 3 insertions, 23 deletions
diff --git a/drivers/isdn/hardware/eicon/debug.c b/drivers/isdn/hardware/eicon/debug.c index 362640120886..7a9894cb4557 100644 --- a/drivers/isdn/hardware/eicon/debug.c +++ b/drivers/isdn/hardware/eicon/debug.c | |||
@@ -861,7 +861,7 @@ static int diva_get_idi_adapter_info (IDI_CALL request, dword* serial, dword* lo | |||
861 | void diva_mnt_add_xdi_adapter (const DESCRIPTOR* d) { | 861 | void diva_mnt_add_xdi_adapter (const DESCRIPTOR* d) { |
862 | diva_os_spin_lock_magic_t old_irql, old_irql1; | 862 | diva_os_spin_lock_magic_t old_irql, old_irql1; |
863 | dword sec, usec, logical, serial, org_mask; | 863 | dword sec, usec, logical, serial, org_mask; |
864 | int id, best_id = 0, free_id = -1; | 864 | int id, free_id = -1; |
865 | char tmp[128]; | 865 | char tmp[128]; |
866 | diva_dbg_entry_head_t* pmsg = NULL; | 866 | diva_dbg_entry_head_t* pmsg = NULL; |
867 | int len; | 867 | int len; |
@@ -906,7 +906,6 @@ void diva_mnt_add_xdi_adapter (const DESCRIPTOR* d) { | |||
906 | and slot is still free - reuse it | 906 | and slot is still free - reuse it |
907 | */ | 907 | */ |
908 | free_id = id; | 908 | free_id = id; |
909 | best_id = 1; | ||
910 | break; | 909 | break; |
911 | } | 910 | } |
912 | } | 911 | } |
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c index 8c5c563c4f12..a3395986df3d 100644 --- a/drivers/isdn/hardware/eicon/message.c +++ b/drivers/isdn/hardware/eicon/message.c | |||
@@ -1198,7 +1198,6 @@ static byte connect_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a, | |||
1198 | word ch; | 1198 | word ch; |
1199 | word i; | 1199 | word i; |
1200 | word Info; | 1200 | word Info; |
1201 | word CIP; | ||
1202 | byte LinkLayer; | 1201 | byte LinkLayer; |
1203 | API_PARSE * ai; | 1202 | API_PARSE * ai; |
1204 | API_PARSE * bp; | 1203 | API_PARSE * bp; |
@@ -1340,7 +1339,6 @@ static byte connect_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a, | |||
1340 | add_s(plci,BC,&parms[6]); | 1339 | add_s(plci,BC,&parms[6]); |
1341 | add_s(plci,LLC,&parms[7]); | 1340 | add_s(plci,LLC,&parms[7]); |
1342 | add_s(plci,HLC,&parms[8]); | 1341 | add_s(plci,HLC,&parms[8]); |
1343 | CIP = GET_WORD(parms[0].info); | ||
1344 | if (a->Info_Mask[appl->Id-1] & 0x200) | 1342 | if (a->Info_Mask[appl->Id-1] & 0x200) |
1345 | { | 1343 | { |
1346 | /* early B3 connect (CIP mask bit 9) no release after a disc */ | 1344 | /* early B3 connect (CIP mask bit 9) no release after a disc */ |
@@ -4830,7 +4828,6 @@ static void sig_ind(PLCI *plci) | |||
4830 | dword x_Id; | 4828 | dword x_Id; |
4831 | dword Id; | 4829 | dword Id; |
4832 | dword rId; | 4830 | dword rId; |
4833 | word Number = 0; | ||
4834 | word i; | 4831 | word i; |
4835 | word cip; | 4832 | word cip; |
4836 | dword cip_mask; | 4833 | dword cip_mask; |
@@ -5106,7 +5103,7 @@ static void sig_ind(PLCI *plci) | |||
5106 | } | 5103 | } |
5107 | } | 5104 | } |
5108 | 5105 | ||
5109 | if(plci->appl) Number = plci->appl->Number++; | 5106 | if(plci->appl) plci->appl->Number++; |
5110 | 5107 | ||
5111 | switch(plci->Sig.Ind) { | 5108 | switch(plci->Sig.Ind) { |
5112 | /* Response to Get_Supported_Services request */ | 5109 | /* Response to Get_Supported_Services request */ |
@@ -5894,7 +5891,6 @@ static void sig_ind(PLCI *plci) | |||
5894 | break; | 5891 | break; |
5895 | 5892 | ||
5896 | case TEL_CTRL: | 5893 | case TEL_CTRL: |
5897 | Number = 0; | ||
5898 | ie = multi_fac_parms[0]; /* inspect the facility hook indications */ | 5894 | ie = multi_fac_parms[0]; /* inspect the facility hook indications */ |
5899 | if(plci->State==ADVANCED_VOICE_SIG && ie[0]){ | 5895 | if(plci->State==ADVANCED_VOICE_SIG && ie[0]){ |
5900 | switch (ie[1]&0x91) { | 5896 | switch (ie[1]&0x91) { |
@@ -10119,14 +10115,12 @@ static byte dtmf_request (dword Id, word Number, DIVA_CAPI_ADAPTER *a, PLCI | |||
10119 | 10115 | ||
10120 | static void dtmf_confirmation (dword Id, PLCI *plci) | 10116 | static void dtmf_confirmation (dword Id, PLCI *plci) |
10121 | { | 10117 | { |
10122 | word Info; | ||
10123 | word i; | 10118 | word i; |
10124 | byte result[4]; | 10119 | byte result[4]; |
10125 | 10120 | ||
10126 | dbug (1, dprintf ("[%06lx] %s,%d: dtmf_confirmation", | 10121 | dbug (1, dprintf ("[%06lx] %s,%d: dtmf_confirmation", |
10127 | UnMapId (Id), (char *)(FILE_), __LINE__)); | 10122 | UnMapId (Id), (char *)(FILE_), __LINE__)); |
10128 | 10123 | ||
10129 | Info = GOOD; | ||
10130 | result[0] = 2; | 10124 | result[0] = 2; |
10131 | PUT_WORD (&result[1], DTMF_SUCCESS); | 10125 | PUT_WORD (&result[1], DTMF_SUCCESS); |
10132 | if (plci->dtmf_send_requests != 0) | 10126 | if (plci->dtmf_send_requests != 0) |
@@ -11520,13 +11514,12 @@ static word mixer_restore_config (dword Id, PLCI *plci, byte Rc) | |||
11520 | static void mixer_command (dword Id, PLCI *plci, byte Rc) | 11514 | static void mixer_command (dword Id, PLCI *plci, byte Rc) |
11521 | { | 11515 | { |
11522 | DIVA_CAPI_ADAPTER *a; | 11516 | DIVA_CAPI_ADAPTER *a; |
11523 | word i, internal_command, Info; | 11517 | word i, internal_command; |
11524 | 11518 | ||
11525 | dbug (1, dprintf ("[%06lx] %s,%d: mixer_command %02x %04x %04x", | 11519 | dbug (1, dprintf ("[%06lx] %s,%d: mixer_command %02x %04x %04x", |
11526 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc, plci->internal_command, | 11520 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc, plci->internal_command, |
11527 | plci->li_cmd)); | 11521 | plci->li_cmd)); |
11528 | 11522 | ||
11529 | Info = GOOD; | ||
11530 | a = plci->adapter; | 11523 | a = plci->adapter; |
11531 | internal_command = plci->internal_command; | 11524 | internal_command = plci->internal_command; |
11532 | plci->internal_command = 0; | 11525 | plci->internal_command = 0; |
@@ -11550,7 +11543,6 @@ static void mixer_command (dword Id, PLCI *plci, byte Rc) | |||
11550 | { | 11543 | { |
11551 | dbug (1, dprintf ("[%06lx] %s,%d: Load mixer failed", | 11544 | dbug (1, dprintf ("[%06lx] %s,%d: Load mixer failed", |
11552 | UnMapId (Id), (char *)(FILE_), __LINE__)); | 11545 | UnMapId (Id), (char *)(FILE_), __LINE__)); |
11553 | Info = _FACILITY_NOT_SUPPORTED; | ||
11554 | break; | 11546 | break; |
11555 | } | 11547 | } |
11556 | if (plci->internal_command) | 11548 | if (plci->internal_command) |
@@ -11592,7 +11584,6 @@ static void mixer_command (dword Id, PLCI *plci, byte Rc) | |||
11592 | } while ((plci->li_plci_b_write_pos != plci->li_plci_b_req_pos) | 11584 | } while ((plci->li_plci_b_write_pos != plci->li_plci_b_req_pos) |
11593 | && !(plci->li_plci_b_queue[i] & LI_PLCI_B_LAST_FLAG)); | 11585 | && !(plci->li_plci_b_queue[i] & LI_PLCI_B_LAST_FLAG)); |
11594 | } | 11586 | } |
11595 | Info = _FACILITY_NOT_SUPPORTED; | ||
11596 | break; | 11587 | break; |
11597 | } | 11588 | } |
11598 | if (plci->internal_command) | 11589 | if (plci->internal_command) |
@@ -11610,7 +11601,6 @@ static void mixer_command (dword Id, PLCI *plci, byte Rc) | |||
11610 | { | 11601 | { |
11611 | dbug (1, dprintf ("[%06lx] %s,%d: Unload mixer failed", | 11602 | dbug (1, dprintf ("[%06lx] %s,%d: Unload mixer failed", |
11612 | UnMapId (Id), (char *)(FILE_), __LINE__)); | 11603 | UnMapId (Id), (char *)(FILE_), __LINE__)); |
11613 | Info = _FACILITY_NOT_SUPPORTED; | ||
11614 | break; | 11604 | break; |
11615 | } | 11605 | } |
11616 | if (plci->internal_command) | 11606 | if (plci->internal_command) |
@@ -12448,13 +12438,11 @@ static byte mixer_request (dword Id, word Number, DIVA_CAPI_ADAPTER *a, PLCI | |||
12448 | static void mixer_indication_coefs_set (dword Id, PLCI *plci) | 12438 | static void mixer_indication_coefs_set (dword Id, PLCI *plci) |
12449 | { | 12439 | { |
12450 | dword d; | 12440 | dword d; |
12451 | DIVA_CAPI_ADAPTER *a; | ||
12452 | byte result[12]; | 12441 | byte result[12]; |
12453 | 12442 | ||
12454 | dbug (1, dprintf ("[%06lx] %s,%d: mixer_indication_coefs_set", | 12443 | dbug (1, dprintf ("[%06lx] %s,%d: mixer_indication_coefs_set", |
12455 | UnMapId (Id), (char *)(FILE_), __LINE__)); | 12444 | UnMapId (Id), (char *)(FILE_), __LINE__)); |
12456 | 12445 | ||
12457 | a = plci->adapter; | ||
12458 | if (plci->li_plci_b_read_pos != plci->li_plci_b_req_pos) | 12446 | if (plci->li_plci_b_read_pos != plci->li_plci_b_req_pos) |
12459 | { | 12447 | { |
12460 | do | 12448 | do |
@@ -14111,13 +14099,11 @@ static void select_b_command (dword Id, PLCI *plci, byte Rc) | |||
14111 | 14099 | ||
14112 | static void fax_connect_ack_command (dword Id, PLCI *plci, byte Rc) | 14100 | static void fax_connect_ack_command (dword Id, PLCI *plci, byte Rc) |
14113 | { | 14101 | { |
14114 | word Info; | ||
14115 | word internal_command; | 14102 | word internal_command; |
14116 | 14103 | ||
14117 | dbug (1, dprintf ("[%06lx] %s,%d: fax_connect_ack_command %02x %04x", | 14104 | dbug (1, dprintf ("[%06lx] %s,%d: fax_connect_ack_command %02x %04x", |
14118 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc, plci->internal_command)); | 14105 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc, plci->internal_command)); |
14119 | 14106 | ||
14120 | Info = GOOD; | ||
14121 | internal_command = plci->internal_command; | 14107 | internal_command = plci->internal_command; |
14122 | plci->internal_command = 0; | 14108 | plci->internal_command = 0; |
14123 | switch (internal_command) | 14109 | switch (internal_command) |
@@ -14160,13 +14146,11 @@ static void fax_connect_ack_command (dword Id, PLCI *plci, byte Rc) | |||
14160 | 14146 | ||
14161 | static void fax_edata_ack_command (dword Id, PLCI *plci, byte Rc) | 14147 | static void fax_edata_ack_command (dword Id, PLCI *plci, byte Rc) |
14162 | { | 14148 | { |
14163 | word Info; | ||
14164 | word internal_command; | 14149 | word internal_command; |
14165 | 14150 | ||
14166 | dbug (1, dprintf ("[%06lx] %s,%d: fax_edata_ack_command %02x %04x", | 14151 | dbug (1, dprintf ("[%06lx] %s,%d: fax_edata_ack_command %02x %04x", |
14167 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc, plci->internal_command)); | 14152 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc, plci->internal_command)); |
14168 | 14153 | ||
14169 | Info = GOOD; | ||
14170 | internal_command = plci->internal_command; | 14154 | internal_command = plci->internal_command; |
14171 | plci->internal_command = 0; | 14155 | plci->internal_command = 0; |
14172 | switch (internal_command) | 14156 | switch (internal_command) |
@@ -14395,13 +14379,11 @@ static void rtp_connect_b3_req_command (dword Id, PLCI *plci, byte Rc) | |||
14395 | 14379 | ||
14396 | static void rtp_connect_b3_res_command (dword Id, PLCI *plci, byte Rc) | 14380 | static void rtp_connect_b3_res_command (dword Id, PLCI *plci, byte Rc) |
14397 | { | 14381 | { |
14398 | word Info; | ||
14399 | word internal_command; | 14382 | word internal_command; |
14400 | 14383 | ||
14401 | dbug (1, dprintf ("[%06lx] %s,%d: rtp_connect_b3_res_command %02x %04x", | 14384 | dbug (1, dprintf ("[%06lx] %s,%d: rtp_connect_b3_res_command %02x %04x", |
14402 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc, plci->internal_command)); | 14385 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc, plci->internal_command)); |
14403 | 14386 | ||
14404 | Info = GOOD; | ||
14405 | internal_command = plci->internal_command; | 14387 | internal_command = plci->internal_command; |
14406 | plci->internal_command = 0; | 14388 | plci->internal_command = 0; |
14407 | switch (internal_command) | 14389 | switch (internal_command) |
@@ -14423,7 +14405,6 @@ static void rtp_connect_b3_res_command (dword Id, PLCI *plci, byte Rc) | |||
14423 | { | 14405 | { |
14424 | dbug (1, dprintf ("[%06lx] %s,%d: RTP setting connect resp info failed %02x", | 14406 | dbug (1, dprintf ("[%06lx] %s,%d: RTP setting connect resp info failed %02x", |
14425 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc)); | 14407 | UnMapId (Id), (char *)(FILE_), __LINE__, Rc)); |
14426 | Info = _WRONG_STATE; | ||
14427 | break; | 14408 | break; |
14428 | } | 14409 | } |
14429 | if (plci_nl_busy (plci)) | 14410 | if (plci_nl_busy (plci)) |