aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_init.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-11-23 21:23:36 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:04:02 -0500
commit4790654c71b250018ecc234f6b9f1ed96a55572d (patch)
tree0902dbbcc763aa51c6209b560bff97505c0849eb /drivers/net/netxen/netxen_nic_init.c
parentba734f349d5ba02a736e2d574584c56cd21bad14 (diff)
[netdrvr] netxen: checkpatch fixes (98% trim trailing whitespace)
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
-rw-r--r--drivers/net/netxen/netxen_nic_init.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 1647903a6cf0..74685a1a0b71 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -449,7 +449,7 @@ static int do_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
449} 449}
450 450
451int 451int
452netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr, 452netxen_rom_fast_read_words(struct netxen_adapter *adapter, int addr,
453 u8 *bytes, size_t size) 453 u8 *bytes, size_t size)
454{ 454{
455 int ret; 455 int ret;
@@ -490,7 +490,7 @@ int netxen_rom_fast_write(struct netxen_adapter *adapter, int addr, int data)
490} 490}
491#endif /* 0 */ 491#endif /* 0 */
492 492
493static int do_rom_fast_write_words(struct netxen_adapter *adapter, 493static int do_rom_fast_write_words(struct netxen_adapter *adapter,
494 int addr, u8 *bytes, size_t size) 494 int addr, u8 *bytes, size_t size)
495{ 495{
496 int addridx = addr; 496 int addridx = addr;
@@ -505,7 +505,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
505 ret = do_rom_fast_write(adapter, addridx, data); 505 ret = do_rom_fast_write(adapter, addridx, data);
506 if (ret < 0) 506 if (ret < 0)
507 return ret; 507 return ret;
508 508
509 while(1) { 509 while(1) {
510 int data1; 510 int data1;
511 511
@@ -518,7 +518,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
518 518
519 if (timeout++ >= rom_write_timeout) { 519 if (timeout++ >= rom_write_timeout) {
520 if (last_attempt++ < 4) { 520 if (last_attempt++ < 4) {
521 ret = do_rom_fast_write(adapter, 521 ret = do_rom_fast_write(adapter,
522 addridx, data); 522 addridx, data);
523 if (ret < 0) 523 if (ret < 0)
524 return ret; 524 return ret;
@@ -538,7 +538,7 @@ static int do_rom_fast_write_words(struct netxen_adapter *adapter,
538 return ret; 538 return ret;
539} 539}
540 540
541int netxen_rom_fast_write_words(struct netxen_adapter *adapter, int addr, 541int netxen_rom_fast_write_words(struct netxen_adapter *adapter, int addr,
542 u8 *bytes, size_t size) 542 u8 *bytes, size_t size)
543{ 543{
544 int ret = 0; 544 int ret = 0;
@@ -562,7 +562,7 @@ static int netxen_rom_wrsr(struct netxen_adapter *adapter, int data)
562 return ret; 562 return ret;
563 563
564 netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_ROM_WDATA, data); 564 netxen_crb_writelit_adapter(adapter, NETXEN_ROMUSB_ROM_WDATA, data);
565 netxen_crb_writelit_adapter(adapter, 565 netxen_crb_writelit_adapter(adapter,
566 NETXEN_ROMUSB_ROM_INSTR_OPCODE, 0x1); 566 NETXEN_ROMUSB_ROM_INSTR_OPCODE, 0x1);
567 567
568 ret = netxen_wait_rom_done(adapter); 568 ret = netxen_wait_rom_done(adapter);
@@ -592,7 +592,7 @@ int netxen_backup_crbinit(struct netxen_adapter *adapter)
592 char *buffer = kmalloc(NETXEN_FLASH_SECTOR_SIZE, GFP_KERNEL); 592 char *buffer = kmalloc(NETXEN_FLASH_SECTOR_SIZE, GFP_KERNEL);
593 593
594 if (!buffer) 594 if (!buffer)
595 return -ENOMEM; 595 return -ENOMEM;
596 /* unlock sector 63 */ 596 /* unlock sector 63 */
597 val = netxen_rom_rdsr(adapter); 597 val = netxen_rom_rdsr(adapter);
598 val = val & 0xe3; 598 val = val & 0xe3;
@@ -605,12 +605,12 @@ int netxen_backup_crbinit(struct netxen_adapter *adapter)
605 goto out_kfree; 605 goto out_kfree;
606 606
607 /* copy sector 0 to sector 63 */ 607 /* copy sector 0 to sector 63 */
608 ret = netxen_rom_fast_read_words(adapter, NETXEN_CRBINIT_START, 608 ret = netxen_rom_fast_read_words(adapter, NETXEN_CRBINIT_START,
609 buffer, NETXEN_FLASH_SECTOR_SIZE); 609 buffer, NETXEN_FLASH_SECTOR_SIZE);
610 if (ret != FLASH_SUCCESS) 610 if (ret != FLASH_SUCCESS)
611 goto out_kfree; 611 goto out_kfree;
612 612
613 ret = netxen_rom_fast_write_words(adapter, NETXEN_FIXED_START, 613 ret = netxen_rom_fast_write_words(adapter, NETXEN_FIXED_START,
614 buffer, NETXEN_FLASH_SECTOR_SIZE); 614 buffer, NETXEN_FLASH_SECTOR_SIZE);
615 if (ret != FLASH_SUCCESS) 615 if (ret != FLASH_SUCCESS)
616 goto out_kfree; 616 goto out_kfree;
@@ -658,9 +658,9 @@ static void check_erased_flash(struct netxen_adapter *adapter, int addr)
658 int count = 0, erased_errors = 0; 658 int count = 0, erased_errors = 0;
659 int range; 659 int range;
660 660
661 range = (addr == NETXEN_USER_START) ? 661 range = (addr == NETXEN_USER_START) ?
662 NETXEN_FIXED_START : addr + NETXEN_FLASH_SECTOR_SIZE; 662 NETXEN_FIXED_START : addr + NETXEN_FLASH_SECTOR_SIZE;
663 663
664 for (i = addr; i < range; i += 4) { 664 for (i = addr; i < range; i += 4) {
665 netxen_rom_fast_read(adapter, i, &val); 665 netxen_rom_fast_read(adapter, i, &val);
666 if (val != 0xffffffff) 666 if (val != 0xffffffff)
@@ -1495,7 +1495,7 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
1495 count++; /* now there should be no failure */ 1495 count++; /* now there should be no failure */
1496 pdesc = &rcv_desc->desc_head[producer]; 1496 pdesc = &rcv_desc->desc_head[producer];
1497 skb_reserve(skb, 2); 1497 skb_reserve(skb, 2);
1498 /* 1498 /*
1499 * This will be setup when we receive the 1499 * This will be setup when we receive the
1500 * buffer after it has been filled 1500 * buffer after it has been filled
1501 * skb->dev = netdev; 1501 * skb->dev = netdev;