aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/cxgb3_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r--drivers/net/cxgb3/cxgb3_main.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index f24a27bbd307..944423c497d2 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -719,7 +719,7 @@ static int upgrade_fw(struct adapter *adap)
719 else 719 else
720 dev_err(dev, "failed to upgrade to firmware %d.%d.%d\n", 720 dev_err(dev, "failed to upgrade to firmware %d.%d.%d\n",
721 FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO); 721 FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO);
722 722
723 return ret; 723 return ret;
724} 724}
725 725
@@ -746,7 +746,7 @@ static int update_tpsram(struct adapter *adap)
746 struct device *dev = &adap->pdev->dev; 746 struct device *dev = &adap->pdev->dev;
747 int ret; 747 int ret;
748 char rev; 748 char rev;
749 749
750 rev = t3rev2char(adap); 750 rev = t3rev2char(adap);
751 if (!rev) 751 if (!rev)
752 return 0; 752 return 0;
@@ -760,10 +760,10 @@ static int update_tpsram(struct adapter *adap)
760 buf); 760 buf);
761 return ret; 761 return ret;
762 } 762 }
763 763
764 ret = t3_check_tpsram(adap, tpsram->data, tpsram->size); 764 ret = t3_check_tpsram(adap, tpsram->data, tpsram->size);
765 if (ret) 765 if (ret)
766 goto release_tpsram; 766 goto release_tpsram;
767 767
768 ret = t3_set_proto_sram(adap, tpsram->data); 768 ret = t3_set_proto_sram(adap, tpsram->data);
769 if (ret == 0) 769 if (ret == 0)
@@ -779,7 +779,7 @@ static int update_tpsram(struct adapter *adap)
779 779
780release_tpsram: 780release_tpsram:
781 release_firmware(tpsram); 781 release_firmware(tpsram);
782 782
783 return ret; 783 return ret;
784} 784}
785 785
@@ -2144,7 +2144,7 @@ static void cxgb_netpoll(struct net_device *dev)
2144 for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) { 2144 for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) {
2145 struct sge_qset *qs = &adapter->sge.qs[qidx]; 2145 struct sge_qset *qs = &adapter->sge.qs[qidx];
2146 void *source; 2146 void *source;
2147 2147
2148 if (adapter->flags & USING_MSIX) 2148 if (adapter->flags & USING_MSIX)
2149 source = qs; 2149 source = qs;
2150 else 2150 else
@@ -2339,7 +2339,7 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,
2339 cxgb_close(netdev); 2339 cxgb_close(netdev);
2340 } 2340 }
2341 2341
2342 if (is_offload(adapter) && 2342 if (is_offload(adapter) &&
2343 test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)) 2343 test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map))
2344 offload_close(&adapter->tdev); 2344 offload_close(&adapter->tdev);
2345 2345
@@ -2613,7 +2613,7 @@ static int __devinit init_one(struct pci_dev *pdev,
2613 err = -ENODEV; 2613 err = -ENODEV;
2614 goto out_free_dev; 2614 goto out_free_dev;
2615 } 2615 }
2616 2616
2617 /* 2617 /*
2618 * The card is now ready to go. If any errors occur during device 2618 * The card is now ready to go. If any errors occur during device
2619 * registration we do not fail the whole card but rather proceed only 2619 * registration we do not fail the whole card but rather proceed only