aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia/ipwireless/hardware.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/pcmcia/ipwireless/hardware.c')
-rw-r--r--drivers/char/pcmcia/ipwireless/hardware.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c
index 0ccbbc1f593a..7428734d08a1 100644
--- a/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/drivers/char/pcmcia/ipwireless/hardware.c
@@ -79,8 +79,7 @@ static void report_timing(void)
79 timing_stats.last_report_time = jiffies; 79 timing_stats.last_report_time = jiffies;
80 if (!first) 80 if (!first)
81 printk(KERN_INFO IPWIRELESS_PCCARD_NAME 81 printk(KERN_INFO IPWIRELESS_PCCARD_NAME
82 ": %u us elapsed - read %lu bytes in %u us, " 82 ": %u us elapsed - read %lu bytes in %u us, wrote %lu bytes in %u us\n",
83 "wrote %lu bytes in %u us\n",
84 jiffies_to_usecs(since), 83 jiffies_to_usecs(since),
85 timing_stats.read_bytes, 84 timing_stats.read_bytes,
86 jiffies_to_usecs(timing_stats.read_time), 85 jiffies_to_usecs(timing_stats.read_time),
@@ -846,8 +845,7 @@ static void do_receive_packet(struct ipw_hardware *hw)
846 len = inw(hw->base_port + IODRR); 845 len = inw(hw->base_port + IODRR);
847 if (len > hw->ll_mtu) { 846 if (len > hw->ll_mtu) {
848 printk(KERN_INFO IPWIRELESS_PCCARD_NAME 847 printk(KERN_INFO IPWIRELESS_PCCARD_NAME
849 ": received a packet of %u bytes - " 848 ": received a packet of %u bytes - longer than the MTU!\n", len);
850 "longer than the MTU!\n", len);
851 outw(DCR_RXDONE | DCR_RXRESET, hw->base_port + IODCR); 849 outw(DCR_RXDONE | DCR_RXRESET, hw->base_port + IODCR);
852 return; 850 return;
853 } 851 }
@@ -863,8 +861,7 @@ static void do_receive_packet(struct ipw_hardware *hw)
863 len = inw(hw->base_port); 861 len = inw(hw->base_port);
864 if (len > hw->ll_mtu) { 862 if (len > hw->ll_mtu) {
865 printk(KERN_INFO IPWIRELESS_PCCARD_NAME 863 printk(KERN_INFO IPWIRELESS_PCCARD_NAME
866 ": received a packet of %u bytes - " 864 ": received a packet of %u bytes - longer than the MTU!\n", len);
867 "longer than the MTU!\n", len);
868 writew(MEMRX_PCINTACKK, 865 writew(MEMRX_PCINTACKK,
869 &hw->memory_info_regs->memreg_pc_interrupt_ack); 866 &hw->memory_info_regs->memreg_pc_interrupt_ack);
870 return; 867 return;
@@ -1180,8 +1177,7 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
1180 ": spurious interrupt - new_tx mode\n"); 1177 ": spurious interrupt - new_tx mode\n");
1181 else { 1178 else {
1182 printk(KERN_WARNING IPWIRELESS_PCCARD_NAME 1179 printk(KERN_WARNING IPWIRELESS_PCCARD_NAME
1183 ": no valid memreg_tx value - " 1180 ": no valid memreg_tx value - switching to the old memreg_tx\n");
1184 "switching to the old memreg_tx\n");
1185 hw->memreg_tx = 1181 hw->memreg_tx =
1186 &hw->memory_info_regs->memreg_tx_old; 1182 &hw->memory_info_regs->memreg_tx_old;
1187 try_mem_tx_old = 1; 1183 try_mem_tx_old = 1;
@@ -1487,8 +1483,7 @@ static void handle_setup_get_version_rsp(struct ipw_hardware *hw,
1487 if (vers_no == TL_SETUP_VERSION) 1483 if (vers_no == TL_SETUP_VERSION)
1488 __handle_setup_get_version_rsp(hw); 1484 __handle_setup_get_version_rsp(hw);
1489 else 1485 else
1490 printk(KERN_ERR 1486 printk(KERN_ERR IPWIRELESS_PCCARD_NAME
1491 IPWIRELESS_PCCARD_NAME
1492 ": invalid hardware version no %u\n", 1487 ": invalid hardware version no %u\n",
1493 (unsigned int) vers_no); 1488 (unsigned int) vers_no);
1494} 1489}