The patch titled ipwireless: remove dead code has been added to the -mm tree. Its filename is ipwireless-remove-dead-code.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ipwireless: remove dead code From: Jiri Kosina <jkosina@xxxxxxx> Remove unused leftovers of debugging functions. 2.6.25 material. Reported-by: Adrian Bunk <bunk@xxxxxxxxxx> Signed-off-by: Jiri Kosina <jkosina@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/pcmcia/ipwireless/hardware.c | 26 -------------------- drivers/char/pcmcia/ipwireless/hardware.h | 2 - drivers/char/pcmcia/ipwireless/network.c | 15 ----------- drivers/char/pcmcia/ipwireless/network.h | 3 -- 4 files changed, 46 deletions(-) diff -puN drivers/char/pcmcia/ipwireless/hardware.c~ipwireless-remove-dead-code drivers/char/pcmcia/ipwireless/hardware.c --- a/drivers/char/pcmcia/ipwireless/hardware.c~ipwireless-remove-dead-code +++ a/drivers/char/pcmcia/ipwireless/hardware.c @@ -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; diff -puN drivers/char/pcmcia/ipwireless/hardware.h~ipwireless-remove-dead-code drivers/char/pcmcia/ipwireless/hardware.h --- a/drivers/char/pcmcia/ipwireless/hardware.h~ipwireless-remove-dead-code +++ a/drivers/char/pcmcia/ipwireless/hardware.h @@ -58,7 +58,5 @@ void ipwireless_init_hardware_v1(struct 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 diff -puN drivers/char/pcmcia/ipwireless/network.c~ipwireless-remove-dead-code drivers/char/pcmcia/ipwireless/network.c --- a/drivers/char/pcmcia/ipwireless/network.c~ipwireless-remove-dead-code +++ a/drivers/char/pcmcia/ipwireless/network.c @@ -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; diff -puN drivers/char/pcmcia/ipwireless/network.h~ipwireless-remove-dead-code drivers/char/pcmcia/ipwireless/network.h --- a/drivers/char/pcmcia/ipwireless/network.h~ipwireless-remove-dead-code +++ a/drivers/char/pcmcia/ipwireless/network.h @@ -49,7 +49,4 @@ void ipwireless_ppp_close(struct ipw_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 _ Patches currently in -mm which might be from jkosina@xxxxxxx are git-hid.patch elantech-touchpad-driver.patch ipwireless-remove-dead-code.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html