diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-06-01 07:17:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-02 05:21:05 -0400 |
commit | 3bd9303500b1961d15aae783f17075936026ae79 (patch) | |
tree | 2a95968b2e5c18ad059541bb7823b5687a5d312c /drivers/net | |
parent | 8f574b35f22fbb9b5e5f1d11ad6b55b6f35f4533 (diff) |
sfc: Rename struct efx_mcdi_phy_cfg to efx_mcdi_phy_data
Most of its members are constant capabilities, not configuration. The
new name is also consistent with the name of the pointer to it in
struct efx_nic and the names of structures used by other PHY drivers.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/sfc/mcdi_phy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c index 6032c0e1f1f8..5c23f22f80c1 100644 --- a/drivers/net/sfc/mcdi_phy.c +++ b/drivers/net/sfc/mcdi_phy.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "nic.h" | 20 | #include "nic.h" |
21 | #include "selftest.h" | 21 | #include "selftest.h" |
22 | 22 | ||
23 | struct efx_mcdi_phy_cfg { | 23 | struct efx_mcdi_phy_data { |
24 | u32 flags; | 24 | u32 flags; |
25 | u32 type; | 25 | u32 type; |
26 | u32 supported_cap; | 26 | u32 supported_cap; |
@@ -35,7 +35,7 @@ struct efx_mcdi_phy_cfg { | |||
35 | }; | 35 | }; |
36 | 36 | ||
37 | static int | 37 | static int |
38 | efx_mcdi_get_phy_cfg(struct efx_nic *efx, struct efx_mcdi_phy_cfg *cfg) | 38 | efx_mcdi_get_phy_cfg(struct efx_nic *efx, struct efx_mcdi_phy_data *cfg) |
39 | { | 39 | { |
40 | u8 outbuf[MC_CMD_GET_PHY_CFG_OUT_LEN]; | 40 | u8 outbuf[MC_CMD_GET_PHY_CFG_OUT_LEN]; |
41 | size_t outlen; | 41 | size_t outlen; |
@@ -259,7 +259,7 @@ static u32 ethtool_to_mcdi_cap(u32 cap) | |||
259 | 259 | ||
260 | static u32 efx_get_mcdi_phy_flags(struct efx_nic *efx) | 260 | static u32 efx_get_mcdi_phy_flags(struct efx_nic *efx) |
261 | { | 261 | { |
262 | struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data; | 262 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; |
263 | enum efx_phy_mode mode, supported; | 263 | enum efx_phy_mode mode, supported; |
264 | u32 flags; | 264 | u32 flags; |
265 | 265 | ||
@@ -307,7 +307,7 @@ static u32 mcdi_to_ethtool_media(u32 media) | |||
307 | 307 | ||
308 | static int efx_mcdi_phy_probe(struct efx_nic *efx) | 308 | static int efx_mcdi_phy_probe(struct efx_nic *efx) |
309 | { | 309 | { |
310 | struct efx_mcdi_phy_cfg *phy_data; | 310 | struct efx_mcdi_phy_data *phy_data; |
311 | u8 outbuf[MC_CMD_GET_LINK_OUT_LEN]; | 311 | u8 outbuf[MC_CMD_GET_LINK_OUT_LEN]; |
312 | u32 caps; | 312 | u32 caps; |
313 | int rc; | 313 | int rc; |
@@ -405,7 +405,7 @@ fail: | |||
405 | 405 | ||
406 | int efx_mcdi_phy_reconfigure(struct efx_nic *efx) | 406 | int efx_mcdi_phy_reconfigure(struct efx_nic *efx) |
407 | { | 407 | { |
408 | struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data; | 408 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; |
409 | u32 caps = (efx->link_advertising ? | 409 | u32 caps = (efx->link_advertising ? |
410 | ethtool_to_mcdi_cap(efx->link_advertising) : | 410 | ethtool_to_mcdi_cap(efx->link_advertising) : |
411 | phy_cfg->forced_cap); | 411 | phy_cfg->forced_cap); |
@@ -446,7 +446,7 @@ void efx_mcdi_phy_decode_link(struct efx_nic *efx, | |||
446 | */ | 446 | */ |
447 | void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa) | 447 | void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa) |
448 | { | 448 | { |
449 | struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data; | 449 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; |
450 | u32 rmtadv; | 450 | u32 rmtadv; |
451 | 451 | ||
452 | /* The link partner capabilities are only relevent if the | 452 | /* The link partner capabilities are only relevent if the |
@@ -505,7 +505,7 @@ static void efx_mcdi_phy_remove(struct efx_nic *efx) | |||
505 | 505 | ||
506 | static void efx_mcdi_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd) | 506 | static void efx_mcdi_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd) |
507 | { | 507 | { |
508 | struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data; | 508 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; |
509 | u8 outbuf[MC_CMD_GET_LINK_OUT_LEN]; | 509 | u8 outbuf[MC_CMD_GET_LINK_OUT_LEN]; |
510 | int rc; | 510 | int rc; |
511 | 511 | ||
@@ -535,7 +535,7 @@ static void efx_mcdi_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *e | |||
535 | 535 | ||
536 | static int efx_mcdi_phy_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd) | 536 | static int efx_mcdi_phy_set_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd) |
537 | { | 537 | { |
538 | struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data; | 538 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; |
539 | u32 caps; | 539 | u32 caps; |
540 | int rc; | 540 | int rc; |
541 | 541 | ||
@@ -674,7 +674,7 @@ out: | |||
674 | static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results, | 674 | static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results, |
675 | unsigned flags) | 675 | unsigned flags) |
676 | { | 676 | { |
677 | struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data; | 677 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; |
678 | u32 mode; | 678 | u32 mode; |
679 | int rc; | 679 | int rc; |
680 | 680 | ||
@@ -712,7 +712,7 @@ static int efx_mcdi_phy_run_tests(struct efx_nic *efx, int *results, | |||
712 | 712 | ||
713 | const char *efx_mcdi_phy_test_name(struct efx_nic *efx, unsigned int index) | 713 | const char *efx_mcdi_phy_test_name(struct efx_nic *efx, unsigned int index) |
714 | { | 714 | { |
715 | struct efx_mcdi_phy_cfg *phy_cfg = efx->phy_data; | 715 | struct efx_mcdi_phy_data *phy_cfg = efx->phy_data; |
716 | 716 | ||
717 | if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_BIST_LBN)) { | 717 | if (phy_cfg->flags & (1 << MC_CMD_GET_PHY_CFG_BIST_LBN)) { |
718 | if (index == 0) | 718 | if (index == 0) |