diff options
author | Dimitris Michailidis <dm@chelsio.com> | 2010-12-14 16:36:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-16 16:15:59 -0500 |
commit | ec16400823ce63bc0cfe89df78c6b7bf4a4d684b (patch) | |
tree | 80ca876ae2be7da1a7002ad90819eba7dfc0fdd7 /drivers/net | |
parent | ef306b50b983be4873aed453c1feeaab22f3a098 (diff) |
cxgb4: do not read the clock frequency from VPD
No need to read the clock frequency from VPD, we already get it a bit
later from FW, after any potential adjustments.
Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/cxgb4/t4_hw.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c index e97521c801ea..6af04520fa06 100644 --- a/drivers/net/cxgb4/t4_hw.c +++ b/drivers/net/cxgb4/t4_hw.c | |||
@@ -370,7 +370,7 @@ int t4_seeprom_wp(struct adapter *adapter, bool enable) | |||
370 | static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) | 370 | static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) |
371 | { | 371 | { |
372 | int i, ret; | 372 | int i, ret; |
373 | int ec, sn, v2; | 373 | int ec, sn; |
374 | u8 vpd[VPD_LEN], csum; | 374 | u8 vpd[VPD_LEN], csum; |
375 | unsigned int vpdr_len; | 375 | unsigned int vpdr_len; |
376 | const struct t4_vpd_hdr *v; | 376 | const struct t4_vpd_hdr *v; |
@@ -408,10 +408,8 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p) | |||
408 | 408 | ||
409 | FIND_VPD_KW(ec, "EC"); | 409 | FIND_VPD_KW(ec, "EC"); |
410 | FIND_VPD_KW(sn, "SN"); | 410 | FIND_VPD_KW(sn, "SN"); |
411 | FIND_VPD_KW(v2, "V2"); | ||
412 | #undef FIND_VPD_KW | 411 | #undef FIND_VPD_KW |
413 | 412 | ||
414 | p->cclk = simple_strtoul(vpd + v2, NULL, 10); | ||
415 | memcpy(p->id, v->id_data, ID_LEN); | 413 | memcpy(p->id, v->id_data, ID_LEN); |
416 | strim(p->id); | 414 | strim(p->id); |
417 | memcpy(p->ec, vpd + ec, EC_LEN); | 415 | memcpy(p->ec, vpd + ec, EC_LEN); |