Skip to content

Commit a893877

Browse files
committed
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: David S. Miller <davem@davemloft.net>
2 parents d86fd11 + 92f25ca commit a893877

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

Documentation/devicetree/bindings/net/dsa/lan9303.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ I2C managed mode:
5252

5353
port@1 { /* external port 1 */
5454
reg = <1>;
55-
label = "lan1;
55+
label = "lan1";
5656
};
5757

5858
port@2 { /* external port 2 */
@@ -89,7 +89,7 @@ MDIO managed mode:
8989

9090
port@1 { /* external port 1 */
9191
reg = <1>;
92-
label = "lan1;
92+
label = "lan1";
9393
};
9494

9595
port@2 { /* external port 2 */

drivers/net/dsa/lan9303-core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ static int lan9303_indirect_phy_wait_for_completion(struct lan9303 *chip)
284284
}
285285
if (!(reg & LAN9303_PMI_ACCESS_MII_BUSY))
286286
return 0;
287-
msleep(1);
287+
usleep_range(1000, 2000);
288288
}
289289

290290
return -EIO;
@@ -376,7 +376,7 @@ static int lan9303_switch_wait_for_completion(struct lan9303 *chip)
376376
}
377377
if (!(reg & LAN9303_SWITCH_CSR_CMD_BUSY))
378378
return 0;
379-
msleep(1);
379+
usleep_range(1000, 2000);
380380
}
381381

382382
return -EIO;

drivers/net/dsa/lan9303_i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static int lan9303_i2c_probe(struct i2c_client *client,
5050
return -ENOMEM;
5151

5252
sw_dev->chip.regmap = devm_regmap_init_i2c(client,
53-
&lan9303_i2c_regmap_config);
53+
&lan9303_i2c_regmap_config);
5454
if (IS_ERR(sw_dev->chip.regmap)) {
5555
ret = PTR_ERR(sw_dev->chip.regmap);
5656
dev_err(&client->dev, "Failed to allocate register map: %d\n",

drivers/net/dsa/lan9303_mdio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ static int lan9303_mdio_probe(struct mdio_device *mdiodev)
116116
return -ENOMEM;
117117

118118
sw_dev->chip.regmap = devm_regmap_init(&mdiodev->dev, NULL, sw_dev,
119-
&lan9303_mdio_regmap_config);
119+
&lan9303_mdio_regmap_config);
120120
if (IS_ERR(sw_dev->chip.regmap)) {
121121
ret = PTR_ERR(sw_dev->chip.regmap);
122122
dev_err(&mdiodev->dev, "regmap init failed: %d\n", ret);

include/linux/dsa/lan9303.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ struct lan9303_phy_ops {
1313
#define LAN9303_NUM_ALR_RECORDS 512
1414
struct lan9303_alr_cache_entry {
1515
u8 mac_addr[ETH_ALEN];
16-
u8 port_map; /* Bitmap of ports. Zero if unused entry */
17-
u8 stp_override; /* non zero if set ALR_DAT1_AGE_OVERRID */
16+
u8 port_map; /* Bitmap of ports. Zero if unused entry */
17+
u8 stp_override; /* non zero if set LAN9303_ALR_DAT1_AGE_OVERRID */
1818
};
1919

2020
struct lan9303 {
@@ -28,7 +28,9 @@ struct lan9303 {
2828
struct mutex indirect_mutex; /* protect indexed register access */
2929
const struct lan9303_phy_ops *ops;
3030
bool is_bridged; /* true if port 1 and 2 are bridged */
31-
u32 swe_port_state; /* remember SWE_PORT_STATE while not bridged */
31+
32+
/* remember LAN9303_SWE_PORT_STATE while not bridged */
33+
u32 swe_port_state;
3234
/* LAN9303 do not offer reading specific ALR entry. Cache all
3335
* static entries in a flat table
3436
**/

net/dsa/tag_lan9303.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
8888
}
8989

9090
static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,
91-
struct packet_type *pt)
91+
struct packet_type *pt)
9292
{
9393
u16 *lan9303_tag;
9494
unsigned int source_port;

0 commit comments

Comments
 (0)