diff options
author | Frans Pop <elendil@planet.nl> | 2010-03-24 03:57:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-24 17:01:56 -0400 |
commit | 84d57bd61866c06aee5658fabe43292a231a5992 (patch) | |
tree | e2fd20902b49f4ab5a5b000177f3ab5494ca5d77 /drivers/net/smc9194.c | |
parent | 583d077d35dd8df231c1e391e5406f0faf1a1788 (diff) |
net/smc91xx: remove trailing space in messages
Includes a few whitespace fixes to placate checkpatch.
Signed-off-by: Frans Pop <elendil@planet.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smc9194.c')
-rw-r--r-- | drivers/net/smc9194.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index f9a960e7fc1f..ee1487791d55 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
@@ -529,7 +529,7 @@ static netdev_tx_t smc_wait_to_send_packet(struct sk_buff *skb, | |||
529 | numPages = ((length & 0xfffe) + 6) / 256; | 529 | numPages = ((length & 0xfffe) + 6) / 256; |
530 | 530 | ||
531 | if (numPages > 7 ) { | 531 | if (numPages > 7 ) { |
532 | printk(CARDNAME": Far too big packet error. \n"); | 532 | printk(CARDNAME": Far too big packet error.\n"); |
533 | /* freeing the packet is a good thing here... but should | 533 | /* freeing the packet is a good thing here... but should |
534 | . any packets of this size get down here? */ | 534 | . any packets of this size get down here? */ |
535 | dev_kfree_skb (skb); | 535 | dev_kfree_skb (skb); |
@@ -571,9 +571,9 @@ static netdev_tx_t smc_wait_to_send_packet(struct sk_buff *skb, | |||
571 | if ( !time_out ) { | 571 | if ( !time_out ) { |
572 | /* oh well, wait until the chip finds memory later */ | 572 | /* oh well, wait until the chip finds memory later */ |
573 | SMC_ENABLE_INT( IM_ALLOC_INT ); | 573 | SMC_ENABLE_INT( IM_ALLOC_INT ); |
574 | PRINTK2((CARDNAME": memory allocation deferred. \n")); | 574 | PRINTK2((CARDNAME": memory allocation deferred.\n")); |
575 | /* it's deferred, but I'll handle it later */ | 575 | /* it's deferred, but I'll handle it later */ |
576 | return NETDEV_TX_OK; | 576 | return NETDEV_TX_OK; |
577 | } | 577 | } |
578 | /* or YES! I can send the packet now.. */ | 578 | /* or YES! I can send the packet now.. */ |
579 | smc_hardware_send_packet(dev); | 579 | smc_hardware_send_packet(dev); |
@@ -611,7 +611,7 @@ static void smc_hardware_send_packet( struct net_device * dev ) | |||
611 | ioaddr = dev->base_addr; | 611 | ioaddr = dev->base_addr; |
612 | 612 | ||
613 | if ( !skb ) { | 613 | if ( !skb ) { |
614 | PRINTK((CARDNAME": In XMIT with no packet to send \n")); | 614 | PRINTK((CARDNAME": In XMIT with no packet to send\n")); |
615 | return; | 615 | return; |
616 | } | 616 | } |
617 | length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; | 617 | length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; |
@@ -621,7 +621,7 @@ static void smc_hardware_send_packet( struct net_device * dev ) | |||
621 | packet_no = inb( ioaddr + PNR_ARR + 1 ); | 621 | packet_no = inb( ioaddr + PNR_ARR + 1 ); |
622 | if ( packet_no & 0x80 ) { | 622 | if ( packet_no & 0x80 ) { |
623 | /* or isn't there? BAD CHIP! */ | 623 | /* or isn't there? BAD CHIP! */ |
624 | printk(KERN_DEBUG CARDNAME": Memory allocation failed. \n"); | 624 | printk(KERN_DEBUG CARDNAME": Memory allocation failed.\n"); |
625 | dev_kfree_skb_any(skb); | 625 | dev_kfree_skb_any(skb); |
626 | lp->saved_skb = NULL; | 626 | lp->saved_skb = NULL; |
627 | netif_wake_queue(dev); | 627 | netif_wake_queue(dev); |
@@ -686,7 +686,7 @@ static void smc_hardware_send_packet( struct net_device * dev ) | |||
686 | /* and let the chipset deal with it */ | 686 | /* and let the chipset deal with it */ |
687 | outw( MC_ENQUEUE , ioaddr + MMU_CMD ); | 687 | outw( MC_ENQUEUE , ioaddr + MMU_CMD ); |
688 | 688 | ||
689 | PRINTK2((CARDNAME": Sent packet of length %d \n",length)); | 689 | PRINTK2((CARDNAME": Sent packet of length %d\n", length)); |
690 | 690 | ||
691 | lp->saved_skb = NULL; | 691 | lp->saved_skb = NULL; |
692 | dev_kfree_skb_any (skb); | 692 | dev_kfree_skb_any (skb); |
@@ -938,7 +938,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) | |||
938 | if ( !chip_ids[ ( revision_register >> 4 ) & 0xF ] ) { | 938 | if ( !chip_ids[ ( revision_register >> 4 ) & 0xF ] ) { |
939 | /* I don't recognize this chip, so... */ | 939 | /* I don't recognize this chip, so... */ |
940 | printk(CARDNAME ": IO %x: Unrecognized revision register:" | 940 | printk(CARDNAME ": IO %x: Unrecognized revision register:" |
941 | " %x, Contact author. \n", ioaddr, revision_register ); | 941 | " %x, Contact author.\n", ioaddr, revision_register); |
942 | 942 | ||
943 | retval = -ENODEV; | 943 | retval = -ENODEV; |
944 | goto err_out; | 944 | goto err_out; |
@@ -1075,7 +1075,7 @@ static void print_packet( byte * buf, int length ) | |||
1075 | int remainder; | 1075 | int remainder; |
1076 | int lines; | 1076 | int lines; |
1077 | 1077 | ||
1078 | printk("Packet of length %d \n", length ); | 1078 | printk("Packet of length %d\n", length); |
1079 | lines = length / 16; | 1079 | lines = length / 16; |
1080 | remainder = length % 16; | 1080 | remainder = length % 16; |
1081 | 1081 | ||
@@ -1202,7 +1202,7 @@ static void smc_rcv(struct net_device *dev) | |||
1202 | 1202 | ||
1203 | if ( packet_number & FP_RXEMPTY ) { | 1203 | if ( packet_number & FP_RXEMPTY ) { |
1204 | /* we got called , but nothing was on the FIFO */ | 1204 | /* we got called , but nothing was on the FIFO */ |
1205 | PRINTK((CARDNAME ": WARNING: smc_rcv with nothing on FIFO. \n")); | 1205 | PRINTK((CARDNAME ": WARNING: smc_rcv with nothing on FIFO.\n")); |
1206 | /* don't need to restore anything */ | 1206 | /* don't need to restore anything */ |
1207 | return; | 1207 | return; |
1208 | } | 1208 | } |
@@ -1258,14 +1258,14 @@ static void smc_rcv(struct net_device *dev) | |||
1258 | to send the DWORDs or the bytes first, or some | 1258 | to send the DWORDs or the bytes first, or some |
1259 | mixture. A mixture might improve already slow PIO | 1259 | mixture. A mixture might improve already slow PIO |
1260 | performance */ | 1260 | performance */ |
1261 | PRINTK3((" Reading %d dwords (and %d bytes) \n", | 1261 | PRINTK3((" Reading %d dwords (and %d bytes)\n", |
1262 | packet_length >> 2, packet_length & 3 )); | 1262 | packet_length >> 2, packet_length & 3 )); |
1263 | insl(ioaddr + DATA_1 , data, packet_length >> 2 ); | 1263 | insl(ioaddr + DATA_1 , data, packet_length >> 2 ); |
1264 | /* read the left over bytes */ | 1264 | /* read the left over bytes */ |
1265 | insb( ioaddr + DATA_1, data + (packet_length & 0xFFFFFC), | 1265 | insb( ioaddr + DATA_1, data + (packet_length & 0xFFFFFC), |
1266 | packet_length & 0x3 ); | 1266 | packet_length & 0x3 ); |
1267 | #else | 1267 | #else |
1268 | PRINTK3((" Reading %d words and %d byte(s) \n", | 1268 | PRINTK3((" Reading %d words and %d byte(s)\n", |
1269 | (packet_length >> 1 ), packet_length & 1 )); | 1269 | (packet_length >> 1 ), packet_length & 1 )); |
1270 | insw(ioaddr + DATA_1 , data, packet_length >> 1); | 1270 | insw(ioaddr + DATA_1 , data, packet_length >> 1); |
1271 | if ( packet_length & 1 ) { | 1271 | if ( packet_length & 1 ) { |
@@ -1334,7 +1334,7 @@ static void smc_tx( struct net_device * dev ) | |||
1334 | outw( PTR_AUTOINC | PTR_READ, ioaddr + POINTER ); | 1334 | outw( PTR_AUTOINC | PTR_READ, ioaddr + POINTER ); |
1335 | 1335 | ||
1336 | tx_status = inw( ioaddr + DATA_1 ); | 1336 | tx_status = inw( ioaddr + DATA_1 ); |
1337 | PRINTK3((CARDNAME": TX DONE STATUS: %4x \n", tx_status )); | 1337 | PRINTK3((CARDNAME": TX DONE STATUS: %4x\n", tx_status)); |
1338 | 1338 | ||
1339 | dev->stats.tx_errors++; | 1339 | dev->stats.tx_errors++; |
1340 | if ( tx_status & TS_LOSTCAR ) dev->stats.tx_carrier_errors++; | 1340 | if ( tx_status & TS_LOSTCAR ) dev->stats.tx_carrier_errors++; |
@@ -1348,7 +1348,7 @@ static void smc_tx( struct net_device * dev ) | |||
1348 | #endif | 1348 | #endif |
1349 | 1349 | ||
1350 | if ( tx_status & TS_SUCCESS ) { | 1350 | if ( tx_status & TS_SUCCESS ) { |
1351 | printk(CARDNAME": Successful packet caused interrupt \n"); | 1351 | printk(CARDNAME": Successful packet caused interrupt\n"); |
1352 | } | 1352 | } |
1353 | /* re-enable transmit */ | 1353 | /* re-enable transmit */ |
1354 | SMC_SELECT_BANK( 0 ); | 1354 | SMC_SELECT_BANK( 0 ); |
@@ -1394,7 +1394,7 @@ static irqreturn_t smc_interrupt(int irq, void * dev_id) | |||
1394 | int handled = 0; | 1394 | int handled = 0; |
1395 | 1395 | ||
1396 | 1396 | ||
1397 | PRINTK3((CARDNAME": SMC interrupt started \n")); | 1397 | PRINTK3((CARDNAME": SMC interrupt started\n")); |
1398 | 1398 | ||
1399 | saved_bank = inw( ioaddr + BANK_SELECT ); | 1399 | saved_bank = inw( ioaddr + BANK_SELECT ); |
1400 | 1400 | ||
@@ -1409,7 +1409,7 @@ static irqreturn_t smc_interrupt(int irq, void * dev_id) | |||
1409 | /* set a timeout value, so I don't stay here forever */ | 1409 | /* set a timeout value, so I don't stay here forever */ |
1410 | timeout = 4; | 1410 | timeout = 4; |
1411 | 1411 | ||
1412 | PRINTK2((KERN_WARNING CARDNAME ": MASK IS %x \n", mask )); | 1412 | PRINTK2((KERN_WARNING CARDNAME ": MASK IS %x\n", mask)); |
1413 | do { | 1413 | do { |
1414 | /* read the status flag, and mask it */ | 1414 | /* read the status flag, and mask it */ |
1415 | status = inb( ioaddr + INTERRUPT ) & mask; | 1415 | status = inb( ioaddr + INTERRUPT ) & mask; |
@@ -1419,7 +1419,7 @@ static irqreturn_t smc_interrupt(int irq, void * dev_id) | |||
1419 | handled = 1; | 1419 | handled = 1; |
1420 | 1420 | ||
1421 | PRINTK3((KERN_WARNING CARDNAME | 1421 | PRINTK3((KERN_WARNING CARDNAME |
1422 | ": Handling interrupt status %x \n", status )); | 1422 | ": Handling interrupt status %x\n", status)); |
1423 | 1423 | ||
1424 | if (status & IM_RCV_INT) { | 1424 | if (status & IM_RCV_INT) { |
1425 | /* Got a packet(s). */ | 1425 | /* Got a packet(s). */ |
@@ -1453,7 +1453,7 @@ static irqreturn_t smc_interrupt(int irq, void * dev_id) | |||
1453 | 1453 | ||
1454 | } else if (status & IM_ALLOC_INT ) { | 1454 | } else if (status & IM_ALLOC_INT ) { |
1455 | PRINTK2((KERN_DEBUG CARDNAME | 1455 | PRINTK2((KERN_DEBUG CARDNAME |
1456 | ": Allocation interrupt \n")); | 1456 | ": Allocation interrupt\n")); |
1457 | /* clear this interrupt so it doesn't happen again */ | 1457 | /* clear this interrupt so it doesn't happen again */ |
1458 | mask &= ~IM_ALLOC_INT; | 1458 | mask &= ~IM_ALLOC_INT; |
1459 | 1459 | ||
@@ -1471,9 +1471,9 @@ static irqreturn_t smc_interrupt(int irq, void * dev_id) | |||
1471 | dev->stats.rx_fifo_errors++; | 1471 | dev->stats.rx_fifo_errors++; |
1472 | outb( IM_RX_OVRN_INT, ioaddr + INTERRUPT ); | 1472 | outb( IM_RX_OVRN_INT, ioaddr + INTERRUPT ); |
1473 | } else if (status & IM_EPH_INT ) { | 1473 | } else if (status & IM_EPH_INT ) { |
1474 | PRINTK((CARDNAME ": UNSUPPORTED: EPH INTERRUPT \n")); | 1474 | PRINTK((CARDNAME ": UNSUPPORTED: EPH INTERRUPT\n")); |
1475 | } else if (status & IM_ERCV_INT ) { | 1475 | } else if (status & IM_ERCV_INT ) { |
1476 | PRINTK((CARDNAME ": UNSUPPORTED: ERCV INTERRUPT \n")); | 1476 | PRINTK((CARDNAME ": UNSUPPORTED: ERCV INTERRUPT\n")); |
1477 | outb( IM_ERCV_INT, ioaddr + INTERRUPT ); | 1477 | outb( IM_ERCV_INT, ioaddr + INTERRUPT ); |
1478 | } | 1478 | } |
1479 | } while ( timeout -- ); | 1479 | } while ( timeout -- ); |
@@ -1483,7 +1483,7 @@ static irqreturn_t smc_interrupt(int irq, void * dev_id) | |||
1483 | SMC_SELECT_BANK( 2 ); | 1483 | SMC_SELECT_BANK( 2 ); |
1484 | outb( mask, ioaddr + INT_MASK ); | 1484 | outb( mask, ioaddr + INT_MASK ); |
1485 | 1485 | ||
1486 | PRINTK3(( KERN_WARNING CARDNAME ": MASK is now %x \n", mask )); | 1486 | PRINTK3((KERN_WARNING CARDNAME ": MASK is now %x\n", mask)); |
1487 | outw( saved_pointer, ioaddr + POINTER ); | 1487 | outw( saved_pointer, ioaddr + POINTER ); |
1488 | 1488 | ||
1489 | SMC_SELECT_BANK( saved_bank ); | 1489 | SMC_SELECT_BANK( saved_bank ); |