Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/net/dsa/lan9303-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/dsa/lan9303.h

+5 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct lan9303_phy_ops { 
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  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

	 **/

drivers/net/dsa/lan9303_i2c.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/net/dsa/lan9303_mdio.c

+1 −1

File changed.

Contains only whitespace changes.

net/dsa/tag_lan9303.c

+1 −1

File changed.

Contains only whitespace changes.