Commit a8938773 authored by David S. Miller's avatar David S. Miller

Merge branch 'dsa-lan9303-Linting'

Egil Hjelmeland says:

====================
net: dsa: lan9303: Linting

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
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d86fd113 92f25caf
...@@ -52,7 +52,7 @@ I2C managed mode: ...@@ -52,7 +52,7 @@ I2C managed mode:
port@1 { /* external port 1 */ port@1 { /* external port 1 */
reg = <1>; reg = <1>;
label = "lan1; label = "lan1";
}; };
port@2 { /* external port 2 */ port@2 { /* external port 2 */
...@@ -89,7 +89,7 @@ MDIO managed mode: ...@@ -89,7 +89,7 @@ MDIO managed mode:
port@1 { /* external port 1 */ port@1 { /* external port 1 */
reg = <1>; reg = <1>;
label = "lan1; label = "lan1";
}; };
port@2 { /* external port 2 */ port@2 { /* external port 2 */
......
...@@ -284,7 +284,7 @@ static int lan9303_indirect_phy_wait_for_completion(struct lan9303 *chip) ...@@ -284,7 +284,7 @@ static int lan9303_indirect_phy_wait_for_completion(struct lan9303 *chip)
} }
if (!(reg & LAN9303_PMI_ACCESS_MII_BUSY)) if (!(reg & LAN9303_PMI_ACCESS_MII_BUSY))
return 0; return 0;
msleep(1); usleep_range(1000, 2000);
} }
return -EIO; return -EIO;
...@@ -376,7 +376,7 @@ static int lan9303_switch_wait_for_completion(struct lan9303 *chip) ...@@ -376,7 +376,7 @@ static int lan9303_switch_wait_for_completion(struct lan9303 *chip)
} }
if (!(reg & LAN9303_SWITCH_CSR_CMD_BUSY)) if (!(reg & LAN9303_SWITCH_CSR_CMD_BUSY))
return 0; return 0;
msleep(1); usleep_range(1000, 2000);
} }
return -EIO; return -EIO;
......
...@@ -50,7 +50,7 @@ static int lan9303_i2c_probe(struct i2c_client *client, ...@@ -50,7 +50,7 @@ static int lan9303_i2c_probe(struct i2c_client *client,
return -ENOMEM; return -ENOMEM;
sw_dev->chip.regmap = devm_regmap_init_i2c(client, sw_dev->chip.regmap = devm_regmap_init_i2c(client,
&lan9303_i2c_regmap_config); &lan9303_i2c_regmap_config);
if (IS_ERR(sw_dev->chip.regmap)) { if (IS_ERR(sw_dev->chip.regmap)) {
ret = PTR_ERR(sw_dev->chip.regmap); ret = PTR_ERR(sw_dev->chip.regmap);
dev_err(&client->dev, "Failed to allocate register map: %d\n", dev_err(&client->dev, "Failed to allocate register map: %d\n",
......
...@@ -116,7 +116,7 @@ static int lan9303_mdio_probe(struct mdio_device *mdiodev) ...@@ -116,7 +116,7 @@ static int lan9303_mdio_probe(struct mdio_device *mdiodev)
return -ENOMEM; return -ENOMEM;
sw_dev->chip.regmap = devm_regmap_init(&mdiodev->dev, NULL, sw_dev, 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)) { if (IS_ERR(sw_dev->chip.regmap)) {
ret = PTR_ERR(sw_dev->chip.regmap); ret = PTR_ERR(sw_dev->chip.regmap);
dev_err(&mdiodev->dev, "regmap init failed: %d\n", ret); dev_err(&mdiodev->dev, "regmap init failed: %d\n", ret);
......
...@@ -13,8 +13,8 @@ struct lan9303_phy_ops { ...@@ -13,8 +13,8 @@ struct lan9303_phy_ops {
#define LAN9303_NUM_ALR_RECORDS 512 #define LAN9303_NUM_ALR_RECORDS 512
struct lan9303_alr_cache_entry { struct lan9303_alr_cache_entry {
u8 mac_addr[ETH_ALEN]; u8 mac_addr[ETH_ALEN];
u8 port_map; /* Bitmap of ports. Zero if unused entry */ u8 port_map; /* Bitmap of ports. Zero if unused entry */
u8 stp_override; /* non zero if set ALR_DAT1_AGE_OVERRID */ u8 stp_override; /* non zero if set LAN9303_ALR_DAT1_AGE_OVERRID */
}; };
struct lan9303 { struct lan9303 {
...@@ -28,7 +28,9 @@ struct lan9303 { ...@@ -28,7 +28,9 @@ struct lan9303 {
struct mutex indirect_mutex; /* protect indexed register access */ struct mutex indirect_mutex; /* protect indexed register access */
const struct lan9303_phy_ops *ops; const struct lan9303_phy_ops *ops;
bool is_bridged; /* true if port 1 and 2 are bridged */ 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 /* LAN9303 do not offer reading specific ALR entry. Cache all
* static entries in a flat table * static entries in a flat table
**/ **/
......
...@@ -88,7 +88,7 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -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, 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; u16 *lan9303_tag;
unsigned int source_port; unsigned int source_port;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment