Commit bf7d71c0 authored May 01, 2017 by Vivien Didelot Committed by David S. Miller May 01, 2017

net: dsa: mv88e6xxx: make VTU helpers static



Now that we have chip operations for VTU accesses, mark all helpers from
global1_vtu.c as static. Only the various implementations of the
GetNext, LoadPurge and Flush operations need to be exposed.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0ad5daf6

drivers/net/dsa/mv88e6xxx/global1.h

+0 −24

Original line number	Original line	Diff line number	Diff line
	@@ -50,30 +50,6 @@ int mv88e6xxx_g1_atu_flush(struct mv88e6xxx_chip *chip, u16 fid, bool all);
	int mv88e6xxx_g1_atu_remove(struct mv88e6xxx_chip *chip, u16 fid, int port,		int mv88e6xxx_g1_atu_remove(struct mv88e6xxx_chip *chip, u16 fid, int port,
	bool all);		bool all);

	int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6xxx_g1_vtu_vid_read(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6xxx_g1_vtu_vid_write(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6185_g1_vtu_data_read(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6185_g1_vtu_data_write(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip);
	int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op);
	int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);
	int mv88e6xxx_g1_vtu_stu_getnext(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *vtu);
	int mv88e6xxx_g1_vtu_stu_get(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *vtu);
	int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,		int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry);		struct mv88e6xxx_vtu_entry *entry);
	int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,		int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,

drivers/net/dsa/mv88e6xxx/global1_vtu.c

+24 −24

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	/* Offset 0x02: VTU FID Register */		/* Offset 0x02: VTU FID Register */

	int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	u16 val;		u16 val;
	@@ -31,7 +31,7 @@ int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,
	return 0;		return 0;
	}		}

	int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	u16 val = entry->fid & GLOBAL_VTU_FID_MASK;		u16 val = entry->fid & GLOBAL_VTU_FID_MASK;
	@@ -41,7 +41,7 @@ int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,

	/* Offset 0x03: VTU SID Register */		/* Offset 0x03: VTU SID Register */

	int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	u16 val;		u16 val;
	@@ -56,7 +56,7 @@ int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip,
	return 0;		return 0;
	}		}

	int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	u16 val = entry->sid & GLOBAL_VTU_SID_MASK;		u16 val = entry->sid & GLOBAL_VTU_SID_MASK;
	@@ -66,12 +66,12 @@ int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip,

	/* Offset 0x05: VTU Operation Register */		/* Offset 0x05: VTU Operation Register */

	int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip)		static int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip)
	{		{
	return mv88e6xxx_g1_wait(chip, GLOBAL_VTU_OP, GLOBAL_VTU_OP_BUSY);		return mv88e6xxx_g1_wait(chip, GLOBAL_VTU_OP, GLOBAL_VTU_OP_BUSY);
	}		}

	int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op)		static int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op)
	{		{
	int err;		int err;

	@@ -84,7 +84,7 @@ int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op)

	/* Offset 0x06: VTU VID Register */		/* Offset 0x06: VTU VID Register */

	int mv88e6xxx_g1_vtu_vid_read(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_vid_read(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	u16 val;		u16 val;
	@@ -100,7 +100,7 @@ int mv88e6xxx_g1_vtu_vid_read(struct mv88e6xxx_chip *chip,
	return 0;		return 0;
	}		}

	int mv88e6xxx_g1_vtu_vid_write(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_vid_write(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	u16 val = entry->vid & 0xfff;		u16 val = entry->vid & 0xfff;
	@@ -116,7 +116,7 @@ int mv88e6xxx_g1_vtu_vid_write(struct mv88e6xxx_chip *chip,
	* Offset 0x09: VTU/STU Data Register 3		* Offset 0x09: VTU/STU Data Register 3
	*/		*/

	int mv88e6185_g1_vtu_data_read(struct mv88e6xxx_chip *chip,		static int mv88e6185_g1_vtu_data_read(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	u16 regs[3];		u16 regs[3];
	@@ -144,7 +144,7 @@ int mv88e6185_g1_vtu_data_read(struct mv88e6xxx_chip *chip,
	return 0;		return 0;
	}		}

	int mv88e6185_g1_vtu_data_write(struct mv88e6xxx_chip *chip,		static int mv88e6185_g1_vtu_data_write(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	u16 regs[3] = { 0 };		u16 regs[3] = { 0 };
	@@ -174,7 +174,7 @@ int mv88e6185_g1_vtu_data_write(struct mv88e6xxx_chip *chip,

	/* VLAN Translation Unit Operations */		/* VLAN Translation Unit Operations */

	int mv88e6xxx_g1_vtu_stu_getnext(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_stu_getnext(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	int err;		int err;
	@@ -194,7 +194,7 @@ int mv88e6xxx_g1_vtu_stu_getnext(struct mv88e6xxx_chip *chip,
	return mv88e6xxx_g1_vtu_vid_read(chip, entry);		return mv88e6xxx_g1_vtu_vid_read(chip, entry);
	}		}

	int mv88e6xxx_g1_vtu_stu_get(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_stu_get(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *vtu)		struct mv88e6xxx_vtu_entry *vtu)
	{		{
	struct mv88e6xxx_vtu_entry stu;		struct mv88e6xxx_vtu_entry stu;
	@@ -216,7 +216,7 @@ int mv88e6xxx_g1_vtu_stu_get(struct mv88e6xxx_chip *chip,
	return 0;		return 0;
	}		}

	int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,		static int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
	struct mv88e6xxx_vtu_entry *entry)		struct mv88e6xxx_vtu_entry *entry)
	{		{
	int err;		int err;