aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/t3_hw.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-11-23 21:59:45 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:04:13 -0500
commit2eab17ab880ad8d570d27517e6c9d9fe74adc214 (patch)
tree17baf30d2ae574defcad6c57782ef0192ef7ab9b /drivers/net/cxgb3/t3_hw.c
parentafefce66a5c73aef597074b184b83a4df9704afd (diff)
drivers/net/cxgb3: trim trailing whitespace
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/cxgb3/t3_hw.c')
-rw-r--r--drivers/net/cxgb3/t3_hw.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index fab138100df..dfdda4735bd 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -865,7 +865,7 @@ int t3_get_tp_version(struct adapter *adapter, u32 *vers)
865 1, 1, 5, 1); 865 1, 1, 5, 1);
866 if (ret) 866 if (ret)
867 return ret; 867 return ret;
868 868
869 *vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1); 869 *vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1);
870 870
871 return 0; 871 return 0;
@@ -896,7 +896,7 @@ int t3_check_tpsram_version(struct adapter *adapter, int *must_load)
896 major = G_TP_VERSION_MAJOR(vers); 896 major = G_TP_VERSION_MAJOR(vers);
897 minor = G_TP_VERSION_MINOR(vers); 897 minor = G_TP_VERSION_MINOR(vers);
898 898
899 if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) 899 if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR)
900 return 0; 900 return 0;
901 901
902 if (major != TP_VERSION_MAJOR) 902 if (major != TP_VERSION_MAJOR)
@@ -913,7 +913,7 @@ int t3_check_tpsram_version(struct adapter *adapter, int *must_load)
913} 913}
914 914
915/** 915/**
916 * t3_check_tpsram - check if provided protocol SRAM 916 * t3_check_tpsram - check if provided protocol SRAM
917 * is compatible with this driver 917 * is compatible with this driver
918 * @adapter: the adapter 918 * @adapter: the adapter
919 * @tp_sram: the firmware image to write 919 * @tp_sram: the firmware image to write
@@ -2508,7 +2508,7 @@ static void tp_config(struct adapter *adap, const struct tp_params *p)
2508 t3_set_reg_field(adap, A_TP_PC_CONFIG2, F_CHDRAFULL, 0); 2508 t3_set_reg_field(adap, A_TP_PC_CONFIG2, F_CHDRAFULL, 0);
2509 t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1080); 2509 t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1080);
2510 t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1000); 2510 t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1000);
2511 2511
2512 if (adap->params.rev > 0) { 2512 if (adap->params.rev > 0) {
2513 tp_wr_indirect(adap, A_TP_EGRESS_CONFIG, F_REWRITEFORCETOSIZE); 2513 tp_wr_indirect(adap, A_TP_EGRESS_CONFIG, F_REWRITEFORCETOSIZE);
2514 t3_set_reg_field(adap, A_TP_PARA_REG3, F_TXPACEAUTO, 2514 t3_set_reg_field(adap, A_TP_PARA_REG3, F_TXPACEAUTO,
@@ -2835,7 +2835,7 @@ int t3_set_proto_sram(struct adapter *adap, u8 *data)
2835 t3_write_reg(adap, A_TP_EMBED_OP_FIELD3, cpu_to_be32(*buf++)); 2835 t3_write_reg(adap, A_TP_EMBED_OP_FIELD3, cpu_to_be32(*buf++));
2836 t3_write_reg(adap, A_TP_EMBED_OP_FIELD2, cpu_to_be32(*buf++)); 2836 t3_write_reg(adap, A_TP_EMBED_OP_FIELD2, cpu_to_be32(*buf++));
2837 t3_write_reg(adap, A_TP_EMBED_OP_FIELD1, cpu_to_be32(*buf++)); 2837 t3_write_reg(adap, A_TP_EMBED_OP_FIELD1, cpu_to_be32(*buf++));
2838 2838
2839 t3_write_reg(adap, A_TP_EMBED_OP_FIELD0, i << 1 | 1 << 31); 2839 t3_write_reg(adap, A_TP_EMBED_OP_FIELD0, i << 1 | 1 << 31);
2840 if (t3_wait_op_done(adap, A_TP_EMBED_OP_FIELD0, 1, 1, 5, 1)) 2840 if (t3_wait_op_done(adap, A_TP_EMBED_OP_FIELD0, 1, 1, 5, 1))
2841 return -EIO; 2841 return -EIO;
@@ -3425,13 +3425,13 @@ void early_hw_init(struct adapter *adapter, const struct adapter_info *ai)
3425} 3425}
3426 3426
3427/* 3427/*
3428 * Reset the adapter. 3428 * Reset the adapter.
3429 * Older PCIe cards lose their config space during reset, PCI-X 3429 * Older PCIe cards lose their config space during reset, PCI-X
3430 * ones don't. 3430 * ones don't.
3431 */ 3431 */
3432static int t3_reset_adapter(struct adapter *adapter) 3432static int t3_reset_adapter(struct adapter *adapter)
3433{ 3433{
3434 int i, save_and_restore_pcie = 3434 int i, save_and_restore_pcie =
3435 adapter->params.rev < T3_REV_B2 && is_pcie(adapter); 3435 adapter->params.rev < T3_REV_B2 && is_pcie(adapter);
3436 uint16_t devid = 0; 3436 uint16_t devid = 0;
3437 3437