diff options
author | Jiri Kosina <jkosina@suse.cz> | 2008-04-29 03:59:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:01 -0400 |
commit | 4aacd47bd88126109a7c295b79c93604bd4bfd5a (patch) | |
tree | 9edf2b49aad71ea1215dd5330c15601ffbfcc31f | |
parent | f249fdd8c19ff65825c0be67212cdf22e556668e (diff) |
ipwireless: remove dead code
Remove unused leftovers of debugging functions. 2.6.25 material.
Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/pcmcia/ipwireless/hardware.c | 26 | ||||
-rw-r--r-- | drivers/char/pcmcia/ipwireless/hardware.h | 2 | ||||
-rw-r--r-- | drivers/char/pcmcia/ipwireless/network.c | 15 | ||||
-rw-r--r-- | drivers/char/pcmcia/ipwireless/network.h | 3 |
4 files changed, 0 insertions, 46 deletions
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c index 1f978ff87fa8..fa9d3c945f31 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.c +++ b/drivers/char/pcmcia/ipwireless/hardware.c | |||
@@ -354,32 +354,6 @@ struct ipw_rx_packet { | |||
354 | unsigned int channel_idx; | 354 | unsigned int channel_idx; |
355 | }; | 355 | }; |
356 | 356 | ||
357 | #ifdef IPWIRELESS_STATE_DEBUG | ||
358 | int ipwireless_dump_hardware_state(char *p, size_t limit, | ||
359 | struct ipw_hardware *hw) | ||
360 | { | ||
361 | return snprintf(p, limit, | ||
362 | "debug: initializing=%d\n" | ||
363 | "debug: tx_ready=%d\n" | ||
364 | "debug: tx_queued=%d\n" | ||
365 | "debug: rx_ready=%d\n" | ||
366 | "debug: rx_bytes_queued=%d\n" | ||
367 | "debug: blocking_rx=%d\n" | ||
368 | "debug: removed=%d\n" | ||
369 | "debug: hardware.shutting_down=%d\n" | ||
370 | "debug: to_setup=%d\n", | ||
371 | hw->initializing, | ||
372 | hw->tx_ready, | ||
373 | hw->tx_queued, | ||
374 | hw->rx_ready, | ||
375 | hw->rx_bytes_queued, | ||
376 | hw->blocking_rx, | ||
377 | hw->removed, | ||
378 | hw->shutting_down, | ||
379 | hw->to_setup); | ||
380 | } | ||
381 | #endif | ||
382 | |||
383 | static char *data_type(const unsigned char *buf, unsigned length) | 357 | static char *data_type(const unsigned char *buf, unsigned length) |
384 | { | 358 | { |
385 | struct nl_packet_header *hdr = (struct nl_packet_header *) buf; | 359 | struct nl_packet_header *hdr = (struct nl_packet_header *) buf; |
diff --git a/drivers/char/pcmcia/ipwireless/hardware.h b/drivers/char/pcmcia/ipwireless/hardware.h index c83190ffb0e7..19ce5eb266b1 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.h +++ b/drivers/char/pcmcia/ipwireless/hardware.h | |||
@@ -58,7 +58,5 @@ void ipwireless_init_hardware_v1(struct ipw_hardware *hw, | |||
58 | void *reboot_cb_data); | 58 | void *reboot_cb_data); |
59 | void ipwireless_init_hardware_v2_v3(struct ipw_hardware *hw); | 59 | void ipwireless_init_hardware_v2_v3(struct ipw_hardware *hw); |
60 | void ipwireless_sleep(unsigned int tenths); | 60 | void ipwireless_sleep(unsigned int tenths); |
61 | int ipwireless_dump_hardware_state(char *p, size_t limit, | ||
62 | struct ipw_hardware *hw); | ||
63 | 61 | ||
64 | #endif | 62 | #endif |
diff --git a/drivers/char/pcmcia/ipwireless/network.c b/drivers/char/pcmcia/ipwireless/network.c index d793e68b3e0d..fe914d34f7f6 100644 --- a/drivers/char/pcmcia/ipwireless/network.c +++ b/drivers/char/pcmcia/ipwireless/network.c | |||
@@ -63,21 +63,6 @@ struct ipw_network { | |||
63 | struct work_struct work_go_offline; | 63 | struct work_struct work_go_offline; |
64 | }; | 64 | }; |
65 | 65 | ||
66 | |||
67 | #ifdef IPWIRELESS_STATE_DEBUG | ||
68 | int ipwireless_dump_network_state(char *p, size_t limit, | ||
69 | struct ipw_network *network) | ||
70 | { | ||
71 | return snprintf(p, limit, | ||
72 | "debug: ppp_blocked=%d\n" | ||
73 | "debug: outgoing_packets_queued=%d\n" | ||
74 | "debug: network.shutting_down=%d\n", | ||
75 | network->ppp_blocked, | ||
76 | network->outgoing_packets_queued, | ||
77 | network->shutting_down); | ||
78 | } | ||
79 | #endif | ||
80 | |||
81 | static void notify_packet_sent(void *callback_data, unsigned int packet_length) | 66 | static void notify_packet_sent(void *callback_data, unsigned int packet_length) |
82 | { | 67 | { |
83 | struct ipw_network *network = callback_data; | 68 | struct ipw_network *network = callback_data; |
diff --git a/drivers/char/pcmcia/ipwireless/network.h b/drivers/char/pcmcia/ipwireless/network.h index b0e1e952fd14..ccacd26fc7ef 100644 --- a/drivers/char/pcmcia/ipwireless/network.h +++ b/drivers/char/pcmcia/ipwireless/network.h | |||
@@ -49,7 +49,4 @@ void ipwireless_ppp_close(struct ipw_network *net); | |||
49 | int ipwireless_ppp_channel_index(struct ipw_network *net); | 49 | int ipwireless_ppp_channel_index(struct ipw_network *net); |
50 | int ipwireless_ppp_unit_number(struct ipw_network *net); | 50 | int ipwireless_ppp_unit_number(struct ipw_network *net); |
51 | 51 | ||
52 | int ipwireless_dump_network_state(char *p, size_t limit, | ||
53 | struct ipw_network *net); | ||
54 | |||
55 | #endif | 52 | #endif |