* [PATCH v2 net-next 1/8] net: phy: change format of some declarations
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
@ 2021-06-16 10:01 ` Weihang Li
2021-06-16 15:55 ` Andrew Lunn
2021-06-16 10:01 ` [PATCH v2 net-next 2/8] net: phy: correct format of block comments Weihang Li
` (7 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Weihang Li @ 2021-06-16 10:01 UTC (permalink / raw)
To: davem, kuba, andrew, hkallweit1
Cc: netdev, linuxarm, Wenpeng Liang, Richard Cochran, Weihang Li
From: Wenpeng Liang <liangwenpeng@huawei.com>
Add a blank line after declarations, change the order of them and put the
assignments and declarations together.
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 | 7 ++++---
drivers/net/phy/mdio_bus.c | 1 +
drivers/net/phy/qsemi.c | 1 +
5 files changed, 9 insertions(+), 5 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..07bb484 100644
--- a/drivers/net/phy/et1011c.c
+++ b/drivers/net/phy/et1011c.c
@@ -46,8 +46,8 @@ MODULE_LICENSE("GPL");
static int et1011c_config_aneg(struct phy_device *phydev)
{
- int ctl = 0;
- ctl = phy_read(phydev, MII_BMCR);
+ int ctl = phy_read(phydev, MII_BMCR);
+
if (ctl < 0)
return ctl;
ctl &= ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_SPEED1000 |
@@ -60,9 +60,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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 net-next 1/8] net: phy: change format of some declarations
2021-06-16 10:01 ` [PATCH v2 net-next 1/8] net: phy: change format of some declarations Weihang Li
@ 2021-06-16 15:55 ` Andrew Lunn
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2021-06-16 15:55 UTC (permalink / raw)
To: Weihang Li
Cc: davem, kuba, hkallweit1, netdev, linuxarm, Wenpeng Liang,
Richard Cochran
On Wed, Jun 16, 2021 at 06:01:19PM +0800, Weihang Li wrote:
> From: Wenpeng Liang <liangwenpeng@huawei.com>
>
> Add a blank line after declarations, change the order of them and put the
> assignments and declarations together.
>
> Cc: Richard Cochran <richardcochran@gmail.com>
> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 net-next 2/8] net: phy: correct format of block comments
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
2021-06-16 10:01 ` [PATCH v2 net-next 1/8] net: phy: change format of some declarations Weihang Li
@ 2021-06-16 10:01 ` Weihang Li
2021-06-16 15:56 ` Andrew Lunn
2021-06-16 10:01 ` [PATCH v2 net-next 3/8] net: phy: delete repeated words of comments Weihang Li
` (6 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Weihang Li @ 2021-06-16 10:01 UTC (permalink / raw)
To: davem, kuba, andrew, hkallweit1
Cc: netdev, linuxarm, Wenpeng Liang, Weihang Li
From: Wenpeng Liang <liangwenpeng@huawei.com>
Block comments should not use a trailing */ on a separate line and every
line of a block comment should start with an '*'.
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/lxt.c | 4 ++--
drivers/net/phy/national.c | 6 ++++--
drivers/net/phy/phy-core.c | 3 ++-
drivers/net/phy/phylink.c | 9 ++++++---
drivers/net/phy/vitesse.c | 3 ++-
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index bde3356..e3bf827 100644
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -242,8 +242,8 @@ static int lxt973a2_read_status(struct phy_device *phydev)
return lpa;
/* If both registers are equal, it is suspect but not
- * impossible, hence a new try
- */
+ * impossible, hence a new try
+ */
} while (lpa == adv && retry--);
mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa);
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c
index 46160ba..9ae9cc6b 100644
--- a/drivers/net/phy/national.c
+++ b/drivers/net/phy/national.c
@@ -68,7 +68,8 @@ static int ns_ack_interrupt(struct phy_device *phydev)
return ret;
/* Clear the interrupt status bit by writing a “1”
- * to the corresponding bit in INT_CLEAR (2:0 are reserved) */
+ * to the corresponding bit in INT_CLEAR (2:0 are reserved)
+ */
ret = phy_write(phydev, DP83865_INT_CLEAR, ret & ~0x7);
return ret;
@@ -150,7 +151,8 @@ static int ns_config_init(struct phy_device *phydev)
{
ns_giga_speed_fallback(phydev, ALL_FALLBACK_ON);
/* In the latest MAC or switches design, the 10 Mbps loopback
- is desired to be turned off. */
+ * is desired to be turned off.
+ */
ns_10_base_t_hdx_loopack(phydev, hdx_loopback_off);
return ns_ack_interrupt(phydev);
}
diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 8d333d3..2870c33 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -76,7 +76,8 @@ EXPORT_SYMBOL_GPL(phy_duplex_to_str);
/* A mapping of all SUPPORTED settings to speed/duplex. This table
* must be grouped by speed and sorted in descending match priority
- * - iow, descending speed. */
+ * - iow, descending speed.
+ */
#define PHY_SETTING(s, d, b) { .speed = SPEED_ ## s, .duplex = DUPLEX_ ## d, \
.bit = ETHTOOL_LINK_MODE_ ## b ## _BIT}
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 8ce8db4..35f22a9 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -182,7 +182,8 @@ static int phylink_parse_fixedlink(struct phylink *pl,
pl->link_config.duplex = DUPLEX_FULL;
/* We treat the "pause" and "asym-pause" terminology as
- * defining the link partner's ability. */
+ * defining the link partner's ability.
+ */
if (fwnode_property_read_bool(fixed_node, "pause"))
__set_bit(ETHTOOL_LINK_MODE_Pause_BIT,
pl->link_config.lp_advertising);
@@ -685,7 +686,8 @@ static void phylink_resolve(struct work_struct *w)
phylink_mac_pcs_get_state(pl, &link_state);
/* If we have a phy, the "up" state is the union of
- * both the PHY and the MAC */
+ * both the PHY and the MAC
+ */
if (pl->phydev)
link_state.link &= pl->phy_state.link;
@@ -694,7 +696,8 @@ static void phylink_resolve(struct work_struct *w)
link_state.interface = pl->phy_state.interface;
/* If we have a PHY, we need to update with
- * the PHY flow control bits. */
+ * the PHY flow control bits.
+ */
link_state.pause = pl->phy_state.pause;
mac_config = true;
}
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 16704e2..897b979 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -249,7 +249,8 @@ static int vsc73xx_config_aneg(struct phy_device *phydev)
/* This adds a skew for both TX and RX clocks, so the skew should only be
* applied to "rgmii-id" interfaces. It may not work as expected
- * on "rgmii-txid", "rgmii-rxid" or "rgmii" interfaces. */
+ * on "rgmii-txid", "rgmii-rxid" or "rgmii" interfaces.
+ */
static int vsc8601_add_skew(struct phy_device *phydev)
{
int ret;
--
2.8.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 net-next 3/8] net: phy: delete repeated words of comments
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
2021-06-16 10:01 ` [PATCH v2 net-next 1/8] net: phy: change format of some declarations Weihang Li
2021-06-16 10:01 ` [PATCH v2 net-next 2/8] net: phy: correct format of block comments Weihang Li
@ 2021-06-16 10:01 ` Weihang Li
2021-06-16 15:56 ` Andrew Lunn
2021-06-16 10:01 ` [PATCH v2 net-next 4/8] net: phy: fix space alignment issues Weihang Li
` (5 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Weihang Li @ 2021-06-16 10:01 UTC (permalink / raw)
To: davem, kuba, andrew, hkallweit1
Cc: netdev, linuxarm, Wenpeng Liang, Weihang Li
From: Wenpeng Liang <liangwenpeng@huawei.com>
There are some repeated words in some comments, they should be deleted.
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/phy-c45.c | 2 +-
drivers/net/phy/sfp.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index f4816b7..c617dbc 100644
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -172,7 +172,7 @@ EXPORT_SYMBOL_GPL(genphy_c45_an_config_aneg);
* @phydev: target phy_device struct
*
* Disable auto-negotiation in the Clause 45 PHY. The link parameters
- * parameters are controlled through the PMA/PMD MMD registers.
+ * are controlled through the PMA/PMD MMD registers.
*
* Returns zero on success, negative errno code on failure.
*/
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 37f722c..34e9021 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -2153,7 +2153,7 @@ static void sfp_sm_main(struct sfp *sfp, unsigned int event)
case SFP_S_INIT:
if (event == SFP_E_TIMEOUT && sfp->state & SFP_F_TX_FAULT) {
- /* TX_FAULT is still asserted after t_init or
+ /* TX_FAULT is still asserted after t_init
* or t_start_up, so assume there is a fault.
*/
sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT,
--
2.8.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 net-next 3/8] net: phy: delete repeated words of comments
2021-06-16 10:01 ` [PATCH v2 net-next 3/8] net: phy: delete repeated words of comments Weihang Li
@ 2021-06-16 15:56 ` Andrew Lunn
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2021-06-16 15:56 UTC (permalink / raw)
To: Weihang Li; +Cc: davem, kuba, hkallweit1, netdev, linuxarm, Wenpeng Liang
On Wed, Jun 16, 2021 at 06:01:21PM +0800, Weihang Li wrote:
> From: Wenpeng Liang <liangwenpeng@huawei.com>
>
> There are some repeated words in some comments, they should be deleted.
>
> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 net-next 4/8] net: phy: fix space alignment issues
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
` (2 preceding siblings ...)
2021-06-16 10:01 ` [PATCH v2 net-next 3/8] net: phy: delete repeated words of comments Weihang Li
@ 2021-06-16 10:01 ` Weihang Li
2021-06-16 16:07 ` Andrew Lunn
2021-06-16 10:01 ` [PATCH v2 net-next 5/8] net: phy: fix formatting issues with braces Weihang Li
` (4 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Weihang Li @ 2021-06-16 10:01 UTC (permalink / raw)
To: davem, kuba, andrew, hkallweit1
Cc: netdev, linuxarm, Wenpeng Liang, Weihang Li
From: Wenpeng Liang <liangwenpeng@huawei.com>
There are some space related issues, including spaces at the start of the
line, before tabs, after open parenthesis and before close parenthesis.
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/davicom.c | 6 +++---
drivers/net/phy/sfp-bus.c | 28 ++++++++++++++--------------
drivers/net/phy/spi_ks8995.c | 10 +++++-----
drivers/net/phy/ste10Xp.c | 6 +++---
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index a3b3842c6..4ac4bce 100644
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -43,10 +43,10 @@
#define MII_DM9161_INTR_DPLX_CHANGE 0x0010
#define MII_DM9161_INTR_SPD_CHANGE 0x0008
#define MII_DM9161_INTR_LINK_CHANGE 0x0004
-#define MII_DM9161_INTR_INIT 0x0000
+#define MII_DM9161_INTR_INIT 0x0000
#define MII_DM9161_INTR_STOP \
-(MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK \
- | MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
+ (MII_DM9161_INTR_DPLX_MASK | MII_DM9161_INTR_SPD_MASK | \
+ MII_DM9161_INTR_LINK_MASK | MII_DM9161_INTR_MASK)
#define MII_DM9161_INTR_CHANGE \
(MII_DM9161_INTR_DPLX_CHANGE | \
MII_DM9161_INTR_SPD_CHANGE | \
diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 1db9cea..7362f8c 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -629,14 +629,14 @@ static void sfp_upstream_clear(struct sfp_bus *bus)
* be put via sfp_bus_put() when done.
*
* Returns:
- * - on success, a pointer to the sfp_bus structure,
- * - %NULL if no SFP is specified,
- * - on failure, an error pointer value:
+ * - on success, a pointer to the sfp_bus structure,
+ * - %NULL if no SFP is specified,
+ * - on failure, an error pointer value:
*
- * - corresponding to the errors detailed for
- * fwnode_property_get_reference_args().
- * - %-ENOMEM if we failed to allocate the bus.
- * - an error from the upstream's connect_phy() method.
+ * - corresponding to the errors detailed for
+ * fwnode_property_get_reference_args().
+ * - %-ENOMEM if we failed to allocate the bus.
+ * - an error from the upstream's connect_phy() method.
*/
struct sfp_bus *sfp_bus_find_fwnode(struct fwnode_handle *fwnode)
{
@@ -671,14 +671,14 @@ EXPORT_SYMBOL_GPL(sfp_bus_find_fwnode);
* bus, so it is safe to put the bus after this call.
*
* Returns:
- * - on success, a pointer to the sfp_bus structure,
- * - %NULL if no SFP is specified,
- * - on failure, an error pointer value:
+ * - on success, a pointer to the sfp_bus structure,
+ * - %NULL if no SFP is specified,
+ * - on failure, an error pointer value:
*
- * - corresponding to the errors detailed for
- * fwnode_property_get_reference_args().
- * - %-ENOMEM if we failed to allocate the bus.
- * - an error from the upstream's connect_phy() method.
+ * - corresponding to the errors detailed for
+ * fwnode_property_get_reference_args().
+ * - %-ENOMEM if we failed to allocate the bus.
+ * - an error from the upstream's connect_phy() method.
*/
int sfp_bus_add_upstream(struct sfp_bus *bus, void *upstream,
const struct sfp_upstream_ops *ops)
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index ca49c1a..8b5445a 100644
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -160,11 +160,11 @@ static const struct spi_device_id ks8995_id[] = {
MODULE_DEVICE_TABLE(spi, ks8995_id);
static const struct of_device_id ks8895_spi_of_match[] = {
- { .compatible = "micrel,ks8995" },
- { .compatible = "micrel,ksz8864" },
- { .compatible = "micrel,ksz8795" },
- { },
- };
+ { .compatible = "micrel,ks8995" },
+ { .compatible = "micrel,ksz8864" },
+ { .compatible = "micrel,ksz8795" },
+ { },
+};
MODULE_DEVICE_TABLE(of, ks8895_spi_of_match);
static inline u8 get_chip_id(u8 val)
diff --git a/drivers/net/phy/ste10Xp.c b/drivers/net/phy/ste10Xp.c
index 431fe5e..309e4c3 100644
--- a/drivers/net/phy/ste10Xp.c
+++ b/drivers/net/phy/ste10Xp.c
@@ -20,12 +20,12 @@
#include <linux/mii.h>
#include <linux/phy.h>
-#define MII_XCIIS 0x11 /* Configuration Info IRQ & Status Reg */
-#define MII_XIE 0x12 /* Interrupt Enable Register */
+#define MII_XCIIS 0x11 /* Configuration Info IRQ & Status Reg */
+#define MII_XIE 0x12 /* Interrupt Enable Register */
#define MII_XIE_DEFAULT_MASK 0x0070 /* ANE complete, Remote Fault, Link Down */
#define STE101P_PHY_ID 0x00061c50
-#define STE100P_PHY_ID 0x1c040011
+#define STE100P_PHY_ID 0x1c040011
static int ste10Xp_config_init(struct phy_device *phydev)
{
--
2.8.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 net-next 4/8] net: phy: fix space alignment issues
2021-06-16 10:01 ` [PATCH v2 net-next 4/8] net: phy: fix space alignment issues Weihang Li
@ 2021-06-16 16:07 ` Andrew Lunn
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2021-06-16 16:07 UTC (permalink / raw)
To: Weihang Li; +Cc: davem, kuba, hkallweit1, netdev, linuxarm, Wenpeng Liang
On Wed, Jun 16, 2021 at 06:01:22PM +0800, Weihang Li wrote:
> From: Wenpeng Liang <liangwenpeng@huawei.com>
>
> There are some space related issues, including spaces at the start of the
> line, before tabs, after open parenthesis and before close parenthesis.
>
> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 net-next 5/8] net: phy: fix formatting issues with braces
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
` (3 preceding siblings ...)
2021-06-16 10:01 ` [PATCH v2 net-next 4/8] net: phy: fix space alignment issues Weihang Li
@ 2021-06-16 10:01 ` Weihang Li
2021-06-16 16:08 ` Andrew Lunn
2021-06-16 10:01 ` [PATCH v2 net-next 6/8] net: phy: print the function name by __func__ instead of an fixed string Weihang Li
` (3 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Weihang Li @ 2021-06-16 10:01 UTC (permalink / raw)
To: davem, kuba, andrew, hkallweit1
Cc: netdev, linuxarm, Wenpeng Liang, Weihang Li
From: Wenpeng Liang <liangwenpeng@huawei.com>
Fix following format issues:
1. open brace '{' following function definitions should go to the next
line.
2. braces {} are not necessary for single line statements.
3. else should follow close brace '}'.
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/fixed_phy.c | 4 ++--
drivers/net/phy/phy.c | 3 +--
drivers/net/phy/phy_device.c | 9 ++++-----
drivers/net/phy/phylink.c | 5 ++---
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index 18d81f4..c65fb5f 100644
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -161,8 +161,8 @@ static int fixed_phy_add_gpiod(unsigned int irq, int phy_addr,
}
int fixed_phy_add(unsigned int irq, int phy_addr,
- struct fixed_phy_status *status) {
-
+ struct fixed_phy_status *status)
+{
return fixed_phy_add_gpiod(irq, phy_addr, status, NULL);
}
EXPORT_SYMBOL_GPL(fixed_phy_add);
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 1089a93..8eeb26d 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -380,8 +380,7 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd)
else if (val & BMCR_SPEED100)
phydev->speed = SPEED_100;
else phydev->speed = SPEED_10;
- }
- else {
+ } else {
if (phydev->autoneg == AUTONEG_DISABLE)
change_autoneg = true;
phydev->autoneg = AUTONEG_ENABLE;
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 8573430..5d5f9a9 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -3021,15 +3021,14 @@ static int phy_probe(struct device *dev)
* a controller will attach, and may modify one
* or both of these values
*/
- if (phydrv->features) {
+ if (phydrv->features)
linkmode_copy(phydev->supported, phydrv->features);
- } else if (phydrv->get_features) {
+ else if (phydrv->get_features)
err = phydrv->get_features(phydev);
- } else if (phydev->is_c45) {
+ else if (phydev->is_c45)
err = genphy_c45_pma_read_abilities(phydev);
- } else {
+ else
err = genphy_read_abilities(phydev);
- }
if (err)
goto out;
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 35f22a9..eb29ef5 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1383,11 +1383,10 @@ int phylink_ethtool_ksettings_get(struct phylink *pl,
ASSERT_RTNL();
- if (pl->phydev) {
+ if (pl->phydev)
phy_ethtool_ksettings_get(pl->phydev, kset);
- } else {
+ else
kset->base.port = pl->link_port;
- }
linkmode_copy(kset->link_modes.supported, pl->supported);
--
2.8.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 net-next 5/8] net: phy: fix formatting issues with braces
2021-06-16 10:01 ` [PATCH v2 net-next 5/8] net: phy: fix formatting issues with braces Weihang Li
@ 2021-06-16 16:08 ` Andrew Lunn
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2021-06-16 16:08 UTC (permalink / raw)
To: Weihang Li; +Cc: davem, kuba, hkallweit1, netdev, linuxarm, Wenpeng Liang
On Wed, Jun 16, 2021 at 06:01:23PM +0800, Weihang Li wrote:
> From: Wenpeng Liang <liangwenpeng@huawei.com>
>
> Fix following format issues:
> 1. open brace '{' following function definitions should go to the next
> line.
> 2. braces {} are not necessary for single line statements.
> 3. else should follow close brace '}'.
>
> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 net-next 6/8] net: phy: print the function name by __func__ instead of an fixed string
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
` (4 preceding siblings ...)
2021-06-16 10:01 ` [PATCH v2 net-next 5/8] net: phy: fix formatting issues with braces Weihang Li
@ 2021-06-16 10:01 ` Weihang Li
2021-06-16 16:08 ` Andrew Lunn
2021-06-16 10:01 ` [PATCH v2 net-next 7/8] net: phy: remove unnecessary line continuation Weihang Li
` (2 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Weihang Li @ 2021-06-16 10:01 UTC (permalink / raw)
To: davem, kuba, andrew, hkallweit1
Cc: netdev, linuxarm, Wenpeng Liang, Weihang Li
From: Wenpeng Liang <liangwenpeng@huawei.com>
It's better to use __func__ than a fixed string to print a function's
name.
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/mdio_device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
index 0837319..c94cb53 100644
--- a/drivers/net/phy/mdio_device.c
+++ b/drivers/net/phy/mdio_device.c
@@ -77,7 +77,7 @@ int mdio_device_register(struct mdio_device *mdiodev)
{
int err;
- dev_dbg(&mdiodev->dev, "mdio_device_register\n");
+ dev_dbg(&mdiodev->dev, "%s\n", __func__);
err = mdiobus_register_device(mdiodev);
if (err)
@@ -188,7 +188,7 @@ int mdio_driver_register(struct mdio_driver *drv)
struct mdio_driver_common *mdiodrv = &drv->mdiodrv;
int retval;
- pr_debug("mdio_driver_register: %s\n", mdiodrv->driver.name);
+ pr_debug("%s: %s\n", __func__, mdiodrv->driver.name);
mdiodrv->driver.bus = &mdio_bus_type;
mdiodrv->driver.probe = mdio_probe;
--
2.8.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 net-next 7/8] net: phy: remove unnecessary line continuation
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
` (5 preceding siblings ...)
2021-06-16 10:01 ` [PATCH v2 net-next 6/8] net: phy: print the function name by __func__ instead of an fixed string Weihang Li
@ 2021-06-16 10:01 ` Weihang Li
2021-06-16 16:09 ` Andrew Lunn
2021-06-16 10:01 ` [PATCH v2 net-next 8/8] net: phy: replace if-else statements with switch Weihang Li
2021-06-16 19:40 ` [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues patchwork-bot+netdevbpf
8 siblings, 1 reply; 18+ messages in thread
From: Weihang Li @ 2021-06-16 10:01 UTC (permalink / raw)
To: davem, kuba, andrew, hkallweit1
Cc: netdev, linuxarm, Wenpeng Liang, Weihang Li
From: Wenpeng Liang <liangwenpeng@huawei.com>
Avoid unnecessary line continuations, and put '|' at the end of line.
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/dp83640.c | 4 ++--
drivers/net/phy/et1011c.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 10769bf..705c166 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -170,9 +170,9 @@ static ushort gpio_tab[GPIO_TABLE_SIZE] = {
module_param(chosen_phy, int, 0444);
module_param_array(gpio_tab, ushort, NULL, 0444);
-MODULE_PARM_DESC(chosen_phy, \
+MODULE_PARM_DESC(chosen_phy,
"The address of the PHY to use for the ancillary clock features");
-MODULE_PARM_DESC(gpio_tab, \
+MODULE_PARM_DESC(gpio_tab,
"Which GPIO line to use for which purpose: cal,perout,extts1,...,extts6");
static void dp83640_gpio_defaults(struct ptp_pin_desc *pd)
diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c
index 07bb484..be1b71d 100644
--- a/drivers/net/phy/et1011c.c
+++ b/drivers/net/phy/et1011c.c
@@ -73,10 +73,10 @@ static int et1011c_read_status(struct phy_device *phydev)
ET1011C_GIGABIT_SPEED) {
val = phy_read(phydev, ET1011C_CONFIG_REG);
val &= ~ET1011C_TX_FIFO_MASK;
- phy_write(phydev, ET1011C_CONFIG_REG, val\
- | ET1011C_GMII_INTERFACE\
- | ET1011C_SYS_CLK_EN\
- | ET1011C_TX_FIFO_DEPTH_16);
+ phy_write(phydev, ET1011C_CONFIG_REG, val |
+ ET1011C_GMII_INTERFACE |
+ ET1011C_SYS_CLK_EN |
+ ET1011C_TX_FIFO_DEPTH_16);
}
}
--
2.8.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 net-next 7/8] net: phy: remove unnecessary line continuation
2021-06-16 10:01 ` [PATCH v2 net-next 7/8] net: phy: remove unnecessary line continuation Weihang Li
@ 2021-06-16 16:09 ` Andrew Lunn
0 siblings, 0 replies; 18+ messages in thread
From: Andrew Lunn @ 2021-06-16 16:09 UTC (permalink / raw)
To: Weihang Li; +Cc: davem, kuba, hkallweit1, netdev, linuxarm, Wenpeng Liang
On Wed, Jun 16, 2021 at 06:01:25PM +0800, Weihang Li wrote:
> From: Wenpeng Liang <liangwenpeng@huawei.com>
>
> Avoid unnecessary line continuations, and put '|' at the end of line.
>
> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
> Signed-off-by: Weihang Li <liweihang@huawei.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 net-next 8/8] net: phy: replace if-else statements with switch
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
` (6 preceding siblings ...)
2021-06-16 10:01 ` [PATCH v2 net-next 7/8] net: phy: remove unnecessary line continuation Weihang Li
@ 2021-06-16 10:01 ` Weihang Li
2021-06-16 16:09 ` Andrew Lunn
2021-06-16 19:40 ` [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues patchwork-bot+netdevbpf
8 siblings, 1 reply; 18+ messages in thread
From: Weihang Li @ 2021-06-16 10:01 UTC (permalink / raw)
To: davem, kuba, andrew, hkallweit1; +Cc: netdev, linuxarm, Weihang Li
Switch statement is clearer than a group of 'if-else'.
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
drivers/net/phy/marvell.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 23751d9..3de93c9 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -809,14 +809,19 @@ static int m88e1111_config_init_rgmii_delays(struct phy_device *phydev)
{
int delay;
- if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
+ switch (phydev->interface) {
+ case PHY_INTERFACE_MODE_RGMII_ID:
delay = MII_M1111_RGMII_RX_DELAY | MII_M1111_RGMII_TX_DELAY;
- } else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
+ break;
+ case PHY_INTERFACE_MODE_RGMII_RXID:
delay = MII_M1111_RGMII_RX_DELAY;
- } else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {
+ break;
+ case PHY_INTERFACE_MODE_RGMII_TXID:
delay = MII_M1111_RGMII_TX_DELAY;
- } else {
+ break;
+ default:
delay = 0;
+ break;
}
return phy_modify(phydev, MII_M1111_PHY_EXT_CR,
--
2.8.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues
2021-06-16 10:01 [PATCH v2 net-next 0/8] net: phy: fix some coding-style issues Weihang Li
` (7 preceding siblings ...)
2021-06-16 10:01 ` [PATCH v2 net-next 8/8] net: phy: replace if-else statements with switch Weihang Li
@ 2021-06-16 19:40 ` patchwork-bot+netdevbpf
8 siblings, 0 replies; 18+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-16 19:40 UTC (permalink / raw)
To: Weihang Li; +Cc: davem, kuba, andrew, hkallweit1, netdev, linuxarm
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Wed, 16 Jun 2021 18:01:18 +0800 you wrote:
> Make some cleanups according to the coding style of kernel.
>
> Changes since v1:
> - Update commit description of #1 and #3.
> - Avoid changing the indentation in #2.
> - Change a group of if-else statement into switch from #4 and put it into
> a single patch.
> - Put '|' at the end of line in #5 and #7.
> - Avoid deleting spaces in definition of 'settings' in #5.
> - Drop #8 from the series which needs more discussion with David.
>
> [...]
Here is the summary with links:
- [v2,net-next,1/8] net: phy: change format of some declarations
https://git.kernel.org/netdev/net-next/c/775f25479df9
- [v2,net-next,2/8] net: phy: correct format of block comments
https://git.kernel.org/netdev/net-next/c/1953feb02215
- [v2,net-next,3/8] net: phy: delete repeated words of comments
https://git.kernel.org/netdev/net-next/c/e1f82127d67f
- [v2,net-next,4/8] net: phy: fix space alignment issues
https://git.kernel.org/netdev/net-next/c/3bdee6a8e92e
- [v2,net-next,5/8] net: phy: fix formatting issues with braces
https://git.kernel.org/netdev/net-next/c/169d7a402dfa
- [v2,net-next,6/8] net: phy: print the function name by __func__ instead of an fixed string
https://git.kernel.org/netdev/net-next/c/450bf1f0c60e
- [v2,net-next,7/8] net: phy: remove unnecessary line continuation
https://git.kernel.org/netdev/net-next/c/33ab463220e5
- [v2,net-next,8/8] net: phy: replace if-else statements with switch
https://git.kernel.org/netdev/net-next/c/16d4d650966d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 18+ messages in thread