From: Weihang Li <liweihang@huawei.com>
To: <davem@davemloft.net>, <kuba@kernel.org>, <andrew@lunn.ch>,
<hkallweit1@gmail.com>
Cc: <netdev@vger.kernel.org>, <linuxarm@huawei.com>,
Wenpeng Liang <liangwenpeng@huawei.com>,
Richard Cochran <richardcochran@gmail.com>,
Weihang Li <liweihang@huawei.com>
Subject: [PATCH net-next 1/8] net: phy: add a blank line after declarations
Date: Fri, 11 Jun 2021 14:36:52 +0800 [thread overview]
Message-ID: <1623393419-2521-2-git-send-email-liweihang@huawei.com> (raw)
In-Reply-To: <1623393419-2521-1-git-send-email-liweihang@huawei.com>
From: Wenpeng Liang <liangwenpeng@huawei.com>
There should be a blank line after declarations.
Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/bcm87xx.c | 4 ++--
drivers/net/phy/dp83640.c | 1 +
drivers/net/phy/et1011c.c | 6 ++++--
drivers/net/phy/mdio_bus.c | 1 +
drivers/net/phy/qsemi.c | 1 +
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/phy/bcm87xx.c b/drivers/net/phy/bcm87xx.c
index 4ac8fd1..3135634 100644
--- a/drivers/net/phy/bcm87xx.c
+++ b/drivers/net/phy/bcm87xx.c
@@ -54,9 +54,9 @@ static int bcm87xx_of_reg_init(struct phy_device *phydev)
u16 reg = be32_to_cpup(paddr++);
u16 mask = be32_to_cpup(paddr++);
u16 val_bits = be32_to_cpup(paddr++);
- int val;
u32 regnum = mdiobus_c45_addr(devid, reg);
- val = 0;
+ int val = 0;
+
if (mask) {
val = phy_read(phydev, regnum);
if (val < 0) {
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 0d79f68..10769bf 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -615,6 +615,7 @@ static void prune_rx_ts(struct dp83640_private *dp83640)
static void enable_broadcast(struct phy_device *phydev, int init_page, int on)
{
int val;
+
phy_write(phydev, PAGESEL, 0);
val = phy_read(phydev, PHYCR2);
if (on)
diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c
index 09e07b9..4b3d035 100644
--- a/drivers/net/phy/et1011c.c
+++ b/drivers/net/phy/et1011c.c
@@ -46,7 +46,8 @@ MODULE_LICENSE("GPL");
static int et1011c_config_aneg(struct phy_device *phydev)
{
- int ctl = 0;
+ int ctl;
+
ctl = phy_read(phydev, MII_BMCR);
if (ctl < 0)
return ctl;
@@ -60,9 +61,10 @@ static int et1011c_config_aneg(struct phy_device *phydev)
static int et1011c_read_status(struct phy_device *phydev)
{
+ static int speed;
int ret;
u32 val;
- static int speed;
+
ret = genphy_read_status(phydev);
if (speed != phydev->speed) {
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 6045ad3..2466567 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -175,6 +175,7 @@ EXPORT_SYMBOL(mdiobus_alloc_size);
static void mdiobus_release(struct device *d)
{
struct mii_bus *bus = to_mii_bus(d);
+
BUG_ON(bus->state != MDIOBUS_RELEASED &&
/* for compatibility with error handling in drivers */
bus->state != MDIOBUS_ALLOCATED);
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c
index d5c1aaa..30d15f7 100644
--- a/drivers/net/phy/qsemi.c
+++ b/drivers/net/phy/qsemi.c
@@ -100,6 +100,7 @@ static int qs6612_ack_interrupt(struct phy_device *phydev)
static int qs6612_config_intr(struct phy_device *phydev)
{
int err;
+
if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
/* clear any interrupts before enabling them */
err = qs6612_ack_interrupt(phydev);
--
2.8.1
next prev parent reply other threads:[~2021-06-11 6:40 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 6:36 [PATCH net-next 0/8] net: phy: fix some coding-style issues Weihang Li
2021-06-11 6:36 ` Weihang Li [this message]
2021-06-11 14:31 ` [PATCH net-next 1/8] net: phy: add a blank line after declarations Andrew Lunn
2021-06-15 6:12 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 2/8] net: phy: correct format of block comments Weihang Li
2021-06-11 14:36 ` Andrew Lunn
2021-06-15 6:18 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 3/8] net: phy: delete repeated word " Weihang Li
2021-06-11 14:39 ` Andrew Lunn
2021-06-15 6:21 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 4/8] net: phy: fixed formatting issues with braces Weihang Li
2021-06-11 14:41 ` Andrew Lunn
2021-06-16 6:39 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 5/8] net: phy: fixed space alignment issues Weihang Li
2021-06-11 15:30 ` Andrew Lunn
2021-06-15 6:24 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 6/8] net: phy: print the function name by __func__ instead of an fixed string Weihang Li
2021-06-11 16:05 ` Andrew Lunn
2021-06-15 6:26 ` liweihang
2021-06-16 8:14 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 7/8] net: phy: remove unnecessary line continuation Weihang Li
2021-06-11 16:06 ` Andrew Lunn
2021-06-15 6:26 ` liweihang
2021-06-11 6:36 ` [PATCH net-next 8/8] net: phy: use '__packed' instead of '__attribute__((__packed__))' Weihang Li
2021-06-11 16:07 ` Andrew Lunn
2021-06-14 14:28 ` David Laight
2021-06-16 6:17 ` liweihang
2021-06-16 8:47 ` David Laight
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=1623393419-2521-2-git-send-email-liweihang@huawei.com \
--to=liweihang@huawei.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=liangwenpeng@huawei.com \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
/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).