diff options
author | Tilman Schmidt <tilman@imap.cc> | 2010-02-22 08:09:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-26 04:24:23 -0500 |
commit | 1528b18f7ec2b907711f37667c68e10d9296c882 (patch) | |
tree | 00c887ea15474334898ae1f89a05706be49079ed /drivers/isdn/gigaset/capi.c | |
parent | 63e055d1c6e3a5f6d370cc841d621d5fa4d5d834 (diff) |
gigaset: reduce syslog clutter
Improve readability of the Gigaset driver's kernel messages by
removing a few unnecessary messages and limiting the emission
of some debug messages more narrowly.
Impact: logging
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/gigaset/capi.c')
-rw-r--r-- | drivers/isdn/gigaset/capi.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c index 6f0ae32906bf..20ebcee9b0c0 100644 --- a/drivers/isdn/gigaset/capi.c +++ b/drivers/isdn/gigaset/capi.c | |||
@@ -1427,9 +1427,10 @@ static void do_connect_req(struct gigaset_capi_ctr *iif, | |||
1427 | 1427 | ||
1428 | /* queue & schedule EV_DIAL event */ | 1428 | /* queue & schedule EV_DIAL event */ |
1429 | if (!gigaset_add_event(cs, &bcs->at_state, EV_DIAL, commands, | 1429 | if (!gigaset_add_event(cs, &bcs->at_state, EV_DIAL, commands, |
1430 | bcs->at_state.seq_index, NULL)) | 1430 | bcs->at_state.seq_index, NULL)) { |
1431 | goto oom; | 1431 | info = CAPI_MSGOSRESOURCEERR; |
1432 | gig_dbg(DEBUG_CMD, "scheduling DIAL"); | 1432 | goto error; |
1433 | } | ||
1433 | gigaset_schedule_event(cs); | 1434 | gigaset_schedule_event(cs); |
1434 | ap->connected = APCONN_SETUP; | 1435 | ap->connected = APCONN_SETUP; |
1435 | send_conf(iif, ap, skb, CapiSuccess); | 1436 | send_conf(iif, ap, skb, CapiSuccess); |
@@ -1543,7 +1544,6 @@ static void do_connect_resp(struct gigaset_capi_ctr *iif, | |||
1543 | if (!gigaset_add_event(cs, &cs->bcs[channel-1].at_state, | 1544 | if (!gigaset_add_event(cs, &cs->bcs[channel-1].at_state, |
1544 | EV_ACCEPT, NULL, 0, NULL)) | 1545 | EV_ACCEPT, NULL, 0, NULL)) |
1545 | return; | 1546 | return; |
1546 | gig_dbg(DEBUG_CMD, "scheduling ACCEPT"); | ||
1547 | gigaset_schedule_event(cs); | 1547 | gigaset_schedule_event(cs); |
1548 | return; | 1548 | return; |
1549 | 1549 | ||
@@ -1584,7 +1584,6 @@ static void do_connect_resp(struct gigaset_capi_ctr *iif, | |||
1584 | if (!gigaset_add_event(cs, &cs->bcs[channel-1].at_state, | 1584 | if (!gigaset_add_event(cs, &cs->bcs[channel-1].at_state, |
1585 | EV_HUP, NULL, 0, NULL)) | 1585 | EV_HUP, NULL, 0, NULL)) |
1586 | return; | 1586 | return; |
1587 | gig_dbg(DEBUG_CMD, "scheduling HUP"); | ||
1588 | gigaset_schedule_event(cs); | 1587 | gigaset_schedule_event(cs); |
1589 | return; | 1588 | return; |
1590 | } | 1589 | } |
@@ -1667,11 +1666,9 @@ static void do_connect_b3_resp(struct gigaset_capi_ctr *iif, | |||
1667 | /* trigger hangup, causing eventual DISCONNECT_IND */ | 1666 | /* trigger hangup, causing eventual DISCONNECT_IND */ |
1668 | if (!gigaset_add_event(cs, &bcs->at_state, | 1667 | if (!gigaset_add_event(cs, &bcs->at_state, |
1669 | EV_HUP, NULL, 0, NULL)) { | 1668 | EV_HUP, NULL, 0, NULL)) { |
1670 | dev_err(cs->dev, "%s: out of memory\n", __func__); | ||
1671 | dev_kfree_skb_any(skb); | 1669 | dev_kfree_skb_any(skb); |
1672 | return; | 1670 | return; |
1673 | } | 1671 | } |
1674 | gig_dbg(DEBUG_CMD, "scheduling HUP"); | ||
1675 | gigaset_schedule_event(cs); | 1672 | gigaset_schedule_event(cs); |
1676 | 1673 | ||
1677 | /* emit DISCONNECT_B3_IND */ | 1674 | /* emit DISCONNECT_B3_IND */ |
@@ -1770,11 +1767,9 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif, | |||
1770 | 1767 | ||
1771 | /* trigger hangup, causing eventual DISCONNECT_IND */ | 1768 | /* trigger hangup, causing eventual DISCONNECT_IND */ |
1772 | if (!gigaset_add_event(cs, &bcs->at_state, EV_HUP, NULL, 0, NULL)) { | 1769 | if (!gigaset_add_event(cs, &bcs->at_state, EV_HUP, NULL, 0, NULL)) { |
1773 | dev_err(cs->dev, "%s: out of memory\n", __func__); | ||
1774 | send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR); | 1770 | send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR); |
1775 | return; | 1771 | return; |
1776 | } | 1772 | } |
1777 | gig_dbg(DEBUG_CMD, "scheduling HUP"); | ||
1778 | gigaset_schedule_event(cs); | 1773 | gigaset_schedule_event(cs); |
1779 | 1774 | ||
1780 | /* emit reply */ | 1775 | /* emit reply */ |
@@ -1817,11 +1812,9 @@ static void do_disconnect_b3_req(struct gigaset_capi_ctr *iif, | |||
1817 | /* trigger hangup, causing eventual DISCONNECT_B3_IND */ | 1812 | /* trigger hangup, causing eventual DISCONNECT_B3_IND */ |
1818 | if (!gigaset_add_event(cs, &cs->bcs[channel-1].at_state, | 1813 | if (!gigaset_add_event(cs, &cs->bcs[channel-1].at_state, |
1819 | EV_HUP, NULL, 0, NULL)) { | 1814 | EV_HUP, NULL, 0, NULL)) { |
1820 | dev_err(cs->dev, "%s: out of memory\n", __func__); | ||
1821 | send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR); | 1815 | send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR); |
1822 | return; | 1816 | return; |
1823 | } | 1817 | } |
1824 | gig_dbg(DEBUG_CMD, "scheduling HUP"); | ||
1825 | gigaset_schedule_event(cs); | 1818 | gigaset_schedule_event(cs); |
1826 | 1819 | ||
1827 | /* NCPI parameter: not applicable for B3 Transparent */ | 1820 | /* NCPI parameter: not applicable for B3 Transparent */ |