* [PATCH v2 net-next 1/4] net: dsa: lan9303: Correct register names in comments
2017-11-06 11:42 [PATCH v2 net-next 0/4] net: dsa: lan9303: Linting Egil Hjelmeland
@ 2017-11-06 11:42 ` Egil Hjelmeland
2017-11-06 11:42 ` [PATCH v2 net-next 2/4] net: dsa: lan9303: Fix syntax errors in device tree examples Egil Hjelmeland
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Egil Hjelmeland @ 2017-11-06 11:42 UTC (permalink / raw)
To: andrew, vivien.didelot, f.fainelli, netdev, linux-kernel; +Cc: Egil Hjelmeland
Two comments refer to registers, but lack the LAN9303_ prefix.
Fix that.
Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
include/linux/dsa/lan9303.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/linux/dsa/lan9303.h b/include/linux/dsa/lan9303.h
index 05d8d136baab..f48a85c377de 100644
--- a/include/linux/dsa/lan9303.h
+++ b/include/linux/dsa/lan9303.h
@@ -13,8 +13,8 @@ struct lan9303_phy_ops {
#define LAN9303_NUM_ALR_RECORDS 512
struct lan9303_alr_cache_entry {
u8 mac_addr[ETH_ALEN];
- u8 port_map; /* Bitmap of ports. Zero if unused entry */
- u8 stp_override; /* non zero if set ALR_DAT1_AGE_OVERRID */
+ u8 port_map; /* Bitmap of ports. Zero if unused entry */
+ u8 stp_override; /* non zero if set LAN9303_ALR_DAT1_AGE_OVERRID */
};
struct lan9303 {
@@ -28,7 +28,9 @@ struct lan9303 {
struct mutex indirect_mutex; /* protect indexed register access */
const struct lan9303_phy_ops *ops;
bool is_bridged; /* true if port 1 and 2 are bridged */
- u32 swe_port_state; /* remember SWE_PORT_STATE while not bridged */
+
+ /* remember LAN9303_SWE_PORT_STATE while not bridged */
+ u32 swe_port_state;
/* LAN9303 do not offer reading specific ALR entry. Cache all
* static entries in a flat table
**/
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 net-next 2/4] net: dsa: lan9303: Fix syntax errors in device tree examples
2017-11-06 11:42 [PATCH v2 net-next 0/4] net: dsa: lan9303: Linting Egil Hjelmeland
2017-11-06 11:42 ` [PATCH v2 net-next 1/4] net: dsa: lan9303: Correct register names in comments Egil Hjelmeland
@ 2017-11-06 11:42 ` Egil Hjelmeland
2017-11-06 11:42 ` [PATCH v2 net-next 3/4] net: dsa: lan9303: Replace msleep(1) with usleep_range() Egil Hjelmeland
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Egil Hjelmeland @ 2017-11-06 11:42 UTC (permalink / raw)
To: andrew, vivien.didelot, f.fainelli, netdev, linux-kernel; +Cc: Egil Hjelmeland
Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
Documentation/devicetree/bindings/net/dsa/lan9303.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/dsa/lan9303.txt b/Documentation/devicetree/bindings/net/dsa/lan9303.txt
index 4448d063ddf6..464d6bf87605 100644
--- a/Documentation/devicetree/bindings/net/dsa/lan9303.txt
+++ b/Documentation/devicetree/bindings/net/dsa/lan9303.txt
@@ -52,7 +52,7 @@ I2C managed mode:
port@1 { /* external port 1 */
reg = <1>;
- label = "lan1;
+ label = "lan1";
};
port@2 { /* external port 2 */
@@ -89,7 +89,7 @@ MDIO managed mode:
port@1 { /* external port 1 */
reg = <1>;
- label = "lan1;
+ label = "lan1";
};
port@2 { /* external port 2 */
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 net-next 3/4] net: dsa: lan9303: Replace msleep(1) with usleep_range()
2017-11-06 11:42 [PATCH v2 net-next 0/4] net: dsa: lan9303: Linting Egil Hjelmeland
2017-11-06 11:42 ` [PATCH v2 net-next 1/4] net: dsa: lan9303: Correct register names in comments Egil Hjelmeland
2017-11-06 11:42 ` [PATCH v2 net-next 2/4] net: dsa: lan9303: Fix syntax errors in device tree examples Egil Hjelmeland
@ 2017-11-06 11:42 ` Egil Hjelmeland
2017-11-06 11:42 ` [PATCH v2 net-next 4/4] net: dsa: lan9303: Adjust indenting Egil Hjelmeland
2017-11-08 4:29 ` [PATCH v2 net-next 0/4] net: dsa: lan9303: Linting David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Egil Hjelmeland @ 2017-11-06 11:42 UTC (permalink / raw)
To: andrew, vivien.didelot, f.fainelli, netdev, linux-kernel; +Cc: Egil Hjelmeland
Remove scripts/checkpatch.pl WARNING by replacing msleep(1) with usleep_range()
Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
drivers/net/dsa/lan9303-core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c
index c4afc8f1a66d..70ecd18a5e7d 100644
--- a/drivers/net/dsa/lan9303-core.c
+++ b/drivers/net/dsa/lan9303-core.c
@@ -284,7 +284,7 @@ static int lan9303_indirect_phy_wait_for_completion(struct lan9303 *chip)
}
if (!(reg & LAN9303_PMI_ACCESS_MII_BUSY))
return 0;
- msleep(1);
+ usleep_range(1000, 2000);
}
return -EIO;
@@ -376,7 +376,7 @@ static int lan9303_switch_wait_for_completion(struct lan9303 *chip)
}
if (!(reg & LAN9303_SWITCH_CSR_CMD_BUSY))
return 0;
- msleep(1);
+ usleep_range(1000, 2000);
}
return -EIO;
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 net-next 4/4] net: dsa: lan9303: Adjust indenting
2017-11-06 11:42 [PATCH v2 net-next 0/4] net: dsa: lan9303: Linting Egil Hjelmeland
` (2 preceding siblings ...)
2017-11-06 11:42 ` [PATCH v2 net-next 3/4] net: dsa: lan9303: Replace msleep(1) with usleep_range() Egil Hjelmeland
@ 2017-11-06 11:42 ` Egil Hjelmeland
2017-11-08 4:29 ` [PATCH v2 net-next 0/4] net: dsa: lan9303: Linting David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Egil Hjelmeland @ 2017-11-06 11:42 UTC (permalink / raw)
To: andrew, vivien.didelot, f.fainelli, netdev, linux-kernel; +Cc: Egil Hjelmeland
Remove scripts/checkpatch.pl CHECKs by adjusting indenting.
Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
drivers/net/dsa/lan9303_i2c.c | 2 +-
drivers/net/dsa/lan9303_mdio.c | 2 +-
net/dsa/tag_lan9303.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/lan9303_i2c.c b/drivers/net/dsa/lan9303_i2c.c
index 24ec20f7f444..909a7e864246 100644
--- a/drivers/net/dsa/lan9303_i2c.c
+++ b/drivers/net/dsa/lan9303_i2c.c
@@ -50,7 +50,7 @@ static int lan9303_i2c_probe(struct i2c_client *client,
return -ENOMEM;
sw_dev->chip.regmap = devm_regmap_init_i2c(client,
- &lan9303_i2c_regmap_config);
+ &lan9303_i2c_regmap_config);
if (IS_ERR(sw_dev->chip.regmap)) {
ret = PTR_ERR(sw_dev->chip.regmap);
dev_err(&client->dev, "Failed to allocate register map: %d\n",
diff --git a/drivers/net/dsa/lan9303_mdio.c b/drivers/net/dsa/lan9303_mdio.c
index 0bc56b9900f9..cc9c2ea1c4fe 100644
--- a/drivers/net/dsa/lan9303_mdio.c
+++ b/drivers/net/dsa/lan9303_mdio.c
@@ -116,7 +116,7 @@ static int lan9303_mdio_probe(struct mdio_device *mdiodev)
return -ENOMEM;
sw_dev->chip.regmap = devm_regmap_init(&mdiodev->dev, NULL, sw_dev,
- &lan9303_mdio_regmap_config);
+ &lan9303_mdio_regmap_config);
if (IS_ERR(sw_dev->chip.regmap)) {
ret = PTR_ERR(sw_dev->chip.regmap);
dev_err(&mdiodev->dev, "regmap init failed: %d\n", ret);
diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c
index e526c8967b98..5ba01fc3c6ba 100644
--- a/net/dsa/tag_lan9303.c
+++ b/net/dsa/tag_lan9303.c
@@ -88,7 +88,7 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
}
static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,
- struct packet_type *pt)
+ struct packet_type *pt)
{
u16 *lan9303_tag;
unsigned int source_port;
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 net-next 0/4] net: dsa: lan9303: Linting
2017-11-06 11:42 [PATCH v2 net-next 0/4] net: dsa: lan9303: Linting Egil Hjelmeland
` (3 preceding siblings ...)
2017-11-06 11:42 ` [PATCH v2 net-next 4/4] net: dsa: lan9303: Adjust indenting Egil Hjelmeland
@ 2017-11-08 4:29 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-11-08 4:29 UTC (permalink / raw)
To: privat; +Cc: andrew, vivien.didelot, f.fainelli, netdev, linux-kernel
From: Egil Hjelmeland <privat@egil-hjelmeland.no>
Date: Mon, 6 Nov 2017 12:42:00 +0100
> This series is non-functional.
> - Correct some errors in comments and documentation.
> Remove scripts/checkpatch.pl WARNINGs and most CHECKs:
> - Replace msleep(1) with usleep_range()
> - Adjust indenting
>
> Changes v1 -> v2:
> - Removed patch 4 "Remove unnecessary parentheses", to be addressed later
Series applied, thank you.
^ permalink raw reply [flat|nested] 6+ messages in thread