From 54e1b3004eb85f9317f6c4ceff2e097231c7f52a Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Wed, 20 Dec 2017 22:11:22 +0100 Subject: [PATCH 1/3] net: ibm: emac: replace custom rgmii_mode_name with phy_modes The common phylib defines the same names (in lower-case). Since rgmii_mode_name() is used only in one place and for a "notice-level" printk, I think it can be replaced. Signed-off-by: Christian Lamparter --- drivers/net/ethernet/ibm/emac/rgmii.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) --- 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 p 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 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;