From: Marek Vasut <marex@denx.de>
To: netdev@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>,
"David S . Miller" <davem@davemloft.net>,
Nisar Sayed <Nisar.Sayed@microchip.com>,
Woojung Huh <Woojung.Huh@microchip.com>,
Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
linux-usb@vger.kernel.org
Subject: [PATCH 19/19] usbnet: smsc95xx: Use phy bit operations
Date: Thu, 3 Jan 2019 02:10:40 +0100 [thread overview]
Message-ID: <20190103011040.25974-20-marex@denx.de> (raw)
In-Reply-To: <20190103011040.25974-1-marex@denx.de>
Use bit operations provided by bit.h instead of reimplementing them.
No functional change.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Nisar Sayed <Nisar.Sayed@microchip.com>
Cc: Woojung Huh <Woojung.Huh@microchip.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: linux-usb@vger.kernel.org
To: netdev@vger.kernel.org
---
drivers/net/usb/smsc95xx.c | 67 +++++++++++++-------------------------
1 file changed, 22 insertions(+), 45 deletions(-)
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index c9931955c22a..20e41c15ce13 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -748,47 +748,35 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
{
struct usbnet *dev = netdev_priv(net);
struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
- int buf;
if ((pdata->chip_id == ID_REV_CHIP_ID_9500A_) ||
(pdata->chip_id == ID_REV_CHIP_ID_9530_) ||
(pdata->chip_id == ID_REV_CHIP_ID_89530_) ||
(pdata->chip_id == ID_REV_CHIP_ID_9730_)) {
/* Extend Manual AutoMDIX timer for 9500A/9500Ai */
- buf = phy_read(pdata->phydev,
- PHY_EDPD_CONFIG);
- buf |= PHY_EDPD_CONFIG_EXT_CROSSOVER_;
- phy_write(pdata->phydev,
- PHY_EDPD_CONFIG, buf);
+ phy_set_bits(pdata->phydev, PHY_EDPD_CONFIG,
+ PHY_EDPD_CONFIG_EXT_CROSSOVER_);
}
if (mdix_ctrl == ETH_TP_MDI) {
- buf = phy_read(pdata->phydev,
- SPECIAL_CTRL_STS);
- buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_;
- buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
- SPECIAL_CTRL_STS_AMDIX_STATE_);
- phy_write(pdata->phydev,
- SPECIAL_CTRL_STS, buf);
+ phy_modify(pdata->phydev, SPECIAL_CTRL_STS,
+ SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
+ SPECIAL_CTRL_STS_AMDIX_STATE_,
+ SPECIAL_CTRL_STS_OVRRD_AMDIX_);
} else if (mdix_ctrl == ETH_TP_MDI_X) {
- buf = phy_read(pdata->phydev,
- SPECIAL_CTRL_STS);
- buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_;
- buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
- SPECIAL_CTRL_STS_AMDIX_STATE_);
- buf |= SPECIAL_CTRL_STS_AMDIX_STATE_;
- phy_write(pdata->phydev,
- SPECIAL_CTRL_STS, buf);
+ phy_modify(pdata->phydev, SPECIAL_CTRL_STS,
+ SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
+ SPECIAL_CTRL_STS_AMDIX_STATE_,
+ SPECIAL_CTRL_STS_OVRRD_AMDIX_ |
+ SPECIAL_CTRL_STS_AMDIX_STATE_);
} else if (mdix_ctrl == ETH_TP_MDI_AUTO) {
- buf = phy_read(pdata->phydev,
- SPECIAL_CTRL_STS);
- buf &= ~SPECIAL_CTRL_STS_OVRRD_AMDIX_;
- buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
- SPECIAL_CTRL_STS_AMDIX_STATE_);
- buf |= SPECIAL_CTRL_STS_AMDIX_ENABLE_;
- phy_write(pdata->phydev,
- SPECIAL_CTRL_STS, buf);
+ phy_modify(pdata->phydev, SPECIAL_CTRL_STS,
+ SPECIAL_CTRL_STS_OVRRD_AMDIX_ |
+ SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
+ SPECIAL_CTRL_STS_AMDIX_STATE_,
+ SPECIAL_CTRL_STS_AMDIX_ENABLE_);
}
+
pdata->mdix_ctrl = mdix_ctrl;
}
@@ -951,7 +939,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev)
}
phy_write(pdata->phydev, PHY_INT_MASK,
- PHY_INT_MASK_DEFAULT_);
+ PHY_INT_MASK_DEFAULT_);
ret = genphy_restart_aneg(pdata->phydev);
if (ret)
@@ -1372,15 +1360,7 @@ static int smsc95xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask)
return ret;
/* enable interrupt source */
- ret = phy_read(pdata->phydev, PHY_INT_MASK);
- if (ret < 0)
- return ret;
-
- ret |= mask;
-
- phy_write(pdata->phydev, PHY_INT_MASK, ret);
-
- return 0;
+ return phy_set_bits(pdata->phydev, PHY_INT_MASK, mask);
}
static int smsc95xx_link_ok_nopm(struct usbnet *dev)
@@ -1445,17 +1425,14 @@ static int smsc95xx_enter_suspend1(struct usbnet *dev)
*/
if (pdata->features & FEATURE_PHY_NLP_CROSSOVER)
phy_write(pdata->phydev, PHY_EDPD_CONFIG,
- PHY_EDPD_CONFIG_DEFAULT);
+ PHY_EDPD_CONFIG_DEFAULT);
/* enable energy detect power-down mode */
- ret = phy_read(pdata->phydev, PHY_MODE_CTRL_STS);
+ ret = phy_set_bits(pdata->phydev, PHY_MODE_CTRL_STS,
+ MODE_CTRL_STS_EDPWRDOWN_);
if (ret < 0)
return ret;
- ret |= MODE_CTRL_STS_EDPWRDOWN_;
-
- phy_write(pdata->phydev, PHY_MODE_CTRL_STS, ret);
-
/* enter SUSPEND1 mode */
ret = smsc95xx_read_reg(dev, PM_CTRL, &val);
if (ret < 0)
--
2.19.2
prev parent reply other threads:[~2019-01-03 1:11 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-03 1:10 [PATCH 00/19] usbnet: smsc95xx: Convert to phydev Marek Vasut
2019-01-03 1:10 ` [PATCH 01/19] usbnet: smsc95xx: Fix memory leak in smsc95xx_bind Marek Vasut
2019-01-03 1:10 ` [PATCH 02/19] usbnet: smsc95xx: Stop propagation of in_pm Marek Vasut
2019-01-07 11:02 ` Oliver Neukum
2019-01-07 11:50 ` Marek Vasut
2019-01-03 1:10 ` [PATCH 03/19] usbnet: smsc95xx: Remove smsc95xx_{read,write}_reg_nopm() Marek Vasut
2019-01-03 1:10 ` [PATCH 04/19] usbnet: smsc95xx: Remove __smsc95xx_{read,write}_reg() Marek Vasut
2019-01-03 1:10 ` [PATCH 05/19] usbnet: smsc95xx: Remove smsc95xx_{read,write}_nopm() Marek Vasut
2019-01-03 1:10 ` [PATCH 06/19] usbnet: smsc95xx: Remove __smsc95xx_mdio_{read,write}() Marek Vasut
2019-01-03 1:10 ` [PATCH 07/19] usbnet: smsc95xx: Split the reset function Marek Vasut
2019-01-07 11:05 ` Oliver Neukum
2019-01-03 1:10 ` [PATCH 08/19] usbnet: smsc95xx: Register MII bus Marek Vasut
2019-01-03 1:10 ` [PATCH 09/19] usbnet: smsc95xx: Connect to phydev Marek Vasut
2019-01-03 13:22 ` Andrew Lunn
2019-01-04 2:18 ` Marek Vasut
2019-01-03 1:10 ` [PATCH 10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() Marek Vasut
2019-01-03 13:39 ` Andrew Lunn
2019-01-04 2:19 ` Marek Vasut
2019-01-04 13:24 ` Andrew Lunn
2019-01-04 14:58 ` Marek Vasut
2019-01-04 15:57 ` Andrew Lunn
2019-01-04 18:02 ` Heiner Kallweit
2019-01-03 1:10 ` [PATCH 11/19] usbnet: smsc95xx: Replace smsc95xx_mdio_write() with phy_write() Marek Vasut
2019-01-03 1:10 ` [PATCH 12/19] usbnet: smsc95xx: Replace ad-hoc PHY functions with generic ones Marek Vasut
2019-01-03 13:28 ` Andrew Lunn
2019-01-04 2:19 ` Marek Vasut
2019-01-03 1:10 ` [PATCH 13/19] usbnet: smsc95xx: Replace smsc95xx_link_ok_nopm() Marek Vasut
2019-01-03 1:10 ` [PATCH 14/19] usbnet: smsc95xx: Replace mii_nway_restart() Marek Vasut
2019-01-03 1:10 ` [PATCH 15/19] usbnet: smsc95xx: Replace mii_ethtool_gset() Marek Vasut
2019-01-03 1:10 ` [PATCH 16/19] usbnet: smsc95xx: Replace mii_check_media() Marek Vasut
2019-01-03 1:10 ` [PATCH 17/19] usbnet: smsc95xx: Replace generic_mii_ioctl() Marek Vasut
2019-01-03 1:10 ` [PATCH 18/19] usbnet: smsc95xx: Remove all of the carrier checking code Marek Vasut
2019-01-03 1:10 ` Marek Vasut [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190103011040.25974-20-marex@denx.de \
--to=marex@denx.de \
--cc=Nisar.Sayed@microchip.com \
--cc=Woojung.Huh@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).