Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 135000
b: refs/heads/master
c: f794fd4
h: refs/heads/master
v: v3
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Mar 2, 2009
1 parent e0bad8a commit 85b0839
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 190dbcfd6806c7c88fc028acda95731ffd43979d
refs/heads/master: f794fd440066ccd7d601f405f80aa514b95f15d1
8 changes: 4 additions & 4 deletions trunk/drivers/net/sfc/xfp_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static int xfp_reset_phy(struct efx_nic *efx)
return rc;

fail:
EFX_ERR(efx, "XFP: reset timed out!\n");
EFX_ERR(efx, "PHY reset timed out\n");
return rc;
}

Expand All @@ -88,15 +88,15 @@ static int xfp_phy_init(struct efx_nic *efx)
return -ENOMEM;
efx->phy_data = phy_data;

EFX_INFO(efx, "XFP: PHY ID reg %x (OUI %x model %x revision"
" %x)\n", devid, MDIO_ID_OUI(devid), MDIO_ID_MODEL(devid),
EFX_INFO(efx, "PHY ID reg %x (OUI %x model %x revision %x)\n",
devid, MDIO_ID_OUI(devid), MDIO_ID_MODEL(devid),
MDIO_ID_REV(devid));

phy_data->phy_mode = efx->phy_mode;

rc = xfp_reset_phy(efx);

EFX_INFO(efx, "XFP: PHY init %s.\n",
EFX_INFO(efx, "PHY init %s.\n",
rc ? "failed" : "successful");
if (rc < 0)
goto fail;
Expand Down

0 comments on commit 85b0839

Please sign in to comment.