| Message ID | a9482f4f4037f6eb732de327290a432539648bcd.1513806256.git.chunkeey@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v3,1/3] net: ibm: emac: replace custom rgmii_mode_name with phy_modes | expand |
From: Christian Lamparter <chunkeey@gmail.com> Date: Wed, 20 Dec 2017 23:01:48 +0100 > phy_modes() in the common phy.h already defines the same phy mode > names in lower case. The deleted rgmii_mode_name() is used only > in one place and for a "notice-level" printk. Hence, it will not > be missed. > > Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Applied to net-next.
diff --git a/drivers/net/ethernet/ibm/emac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c index c4a1ac38bba8..9a1c06f2471d 100644 --- a/drivers/net/ethernet/ibm/emac/rgmii.c +++ b/drivers/net/ethernet/ibm/emac/rgmii.c @@ -59,24 +59,6 @@ static inline int rgmii_valid_mode(int phy_mode) phy_mode == PHY_MODE_RTBI; } -static inline const char *rgmii_mode_name(int mode) -{ - switch (mode) { - case PHY_MODE_RGMII: - return "RGMII"; - case PHY_MODE_TBI: - return "TBI"; - case PHY_MODE_GMII: - return "GMII"; - case PHY_MODE_MII: - return "MII"; - case PHY_MODE_RTBI: - return "RTBI"; - default: - BUG(); - } -} - static inline u32 rgmii_mode_mask(int mode, int input) { switch (mode) { @@ -115,7 +97,7 @@ int rgmii_attach(struct platform_device *ofdev, int input, int mode) out_be32(&p->fer, in_be32(&p->fer) | rgmii_mode_mask(mode, input)); printk(KERN_NOTICE "%pOF: input %d in %s mode\n", - ofdev->dev.of_node, input, rgmii_mode_name(mode)); + ofdev->dev.of_node, input, phy_modes(mode)); ++dev->users;
phy_modes() in the common phy.h already defines the same phy mode names in lower case. The deleted rgmii_mode_name() is used only in one place and for a "notice-level" printk. Hence, it will not be missed. Signed-off-by: Christian Lamparter <chunkeey@gmail.com> --- drivers/net/ethernet/ibm/emac/rgmii.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)