Skip to contentSkip to conversation

#if 0 ipwireless_dump_{hardware,network}_state()

PATCH New Adrian Bunk 2 participants 2 messages Feb 13, 2008 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 #if 0 ipwireless_dump_{hardware,network}_state()

This patch #if 0's the unused ipwireless_dump_{hardware,network}_state().

---

 drivers/char/pcmcia/ipwireless/hardware.c |    2 +-
 drivers/char/pcmcia/ipwireless/hardware.h |    2 --
 drivers/char/pcmcia/ipwireless/network.c  |    2 +-
 drivers/char/pcmcia/ipwireless/network.h  |    3 ---

1aaeb739ce70558e6371c43712c14d7afea2da7e diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c index 1f978ff..ed59d8e 100644

drivers/char/pcmcia/ipwireless/hardware.c +1 -1
@@ -354,7 +354,7 @@ struct ipw_rx_packet {
 	unsigned int channel_idx;
 };
 
-#ifdef IPWIRELESS_STATE_DEBUG
+#if 0
 int ipwireless_dump_hardware_state(char *p, size_t limit,
 				   struct ipw_hardware *hw)
 {
drivers/char/pcmcia/ipwireless/hardware.h +0 -2
index c83190f..19ce5eb 100644
@@ -58,7 +58,5 @@ void ipwireless_init_hardware_v1(struct ipw_hardware *hw,
 				 void *reboot_cb_data);
 void ipwireless_init_hardware_v2_v3(struct ipw_hardware *hw);
 void ipwireless_sleep(unsigned int tenths);
-int ipwireless_dump_hardware_state(char *p, size_t limit,
-				   struct ipw_hardware *hw);
 
 #endif
drivers/char/pcmcia/ipwireless/network.c +1 -1
index ff35230..7453e10 100644
@@ -64,7 +64,7 @@ struct ipw_network {
 };
 
 
-#ifdef IPWIRELESS_STATE_DEBUG
+#if 0
 int ipwireless_dump_network_state(char *p, size_t limit,
 				  struct ipw_network *network)
 {
drivers/char/pcmcia/ipwireless/network.h +0 -3
index b0e1e95..ccacd26 100644
@@ -49,7 +49,4 @@ void ipwireless_ppp_close(struct ipw_network *net);
 int ipwireless_ppp_channel_index(struct ipw_network *net);
 int ipwireless_ppp_unit_number(struct ipw_network *net);
 
-int ipwireless_dump_network_state(char *p, size_t limit,
-				  struct ipw_network *net);
-
 #endif
#1 lore raw

PATCH 1/1 ipwireless: remove unused debugging functions (was Re: [2.6 patch] #if 0 ipwireless_dump_{hardware,network}_state())

Quoted 2 lines · Adrian Bunk

This patch #if 0's the unused ipwireless_dump_{hardware,network}_state().

Adrian,

I'd rather remove it completely. Thanks for noticing this.

From: Jiri Kosina <[email protected]>

Remove unused leftovers of debugging functions. Noticed by Adrian Bunk.

drivers/char/pcmcia/ipwireless/hardware.c +0 -26
index 1f978ff..fa9d3c9 100644
@@ -354,32 +354,6 @@ struct ipw_rx_packet {
 	unsigned int channel_idx;
 };
 
-#ifdef IPWIRELESS_STATE_DEBUG
-int ipwireless_dump_hardware_state(char *p, size_t limit,
-				   struct ipw_hardware *hw)
-{
-	return snprintf(p, limit,
-			"debug: initializing=%d\n"
-			"debug: tx_ready=%d\n"
-			"debug: tx_queued=%d\n"
-			"debug: rx_ready=%d\n"
-			"debug: rx_bytes_queued=%d\n"
-			"debug: blocking_rx=%d\n"
-			"debug: removed=%d\n"
-			"debug: hardware.shutting_down=%d\n"
-			"debug: to_setup=%d\n",
-			hw->initializing,
-			hw->tx_ready,
-			hw->tx_queued,
-			hw->rx_ready,
-			hw->rx_bytes_queued,
-			hw->blocking_rx,
-			hw->removed,
-			hw->shutting_down,
-			hw->to_setup);
-}
-#endif
-
 static char *data_type(const unsigned char *buf, unsigned length)
 {
 	struct nl_packet_header *hdr = (struct nl_packet_header *) buf;
drivers/char/pcmcia/ipwireless/hardware.h +0 -2
index c83190f..19ce5eb 100644
@@ -58,7 +58,5 @@ void ipwireless_init_hardware_v1(struct ipw_hardware *hw,
 				 void *reboot_cb_data);
 void ipwireless_init_hardware_v2_v3(struct ipw_hardware *hw);
 void ipwireless_sleep(unsigned int tenths);
-int ipwireless_dump_hardware_state(char *p, size_t limit,
-				   struct ipw_hardware *hw);
 
 #endif
drivers/char/pcmcia/ipwireless/network.c +0 -15
index ff35230..6e189ed 100644
@@ -63,21 +63,6 @@ struct ipw_network {
 	struct work_struct work_go_offline;
 };
 
-
-#ifdef IPWIRELESS_STATE_DEBUG
-int ipwireless_dump_network_state(char *p, size_t limit,
-				  struct ipw_network *network)
-{
-	return snprintf(p, limit,
-			"debug: ppp_blocked=%d\n"
-			"debug: outgoing_packets_queued=%d\n"
-			"debug: network.shutting_down=%d\n",
-			network->ppp_blocked,
-			network->outgoing_packets_queued,
-			network->shutting_down);
-}
-#endif
-
 static void notify_packet_sent(void *callback_data, unsigned int packet_length)
 {
 	struct ipw_network *network = callback_data;
drivers/char/pcmcia/ipwireless/network.h +0 -3
index b0e1e95..ccacd26 100644
@@ -49,7 +49,4 @@ void ipwireless_ppp_close(struct ipw_network *net);
 int ipwireless_ppp_channel_index(struct ipw_network *net);
 int ipwireless_ppp_unit_number(struct ipw_network *net);
 
-int ipwireless_dump_network_state(char *p, size_t limit,
-				  struct ipw_network *net);
-
 #endif