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

Commit a22adce5 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: update DSA drivers to use ds_to_priv 



Use the helper function to retrieve the driver private context instead of
using (void *)(ds + 1).

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7fa857ed

drivers/net/dsa/mv88e6123_61_65.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int mv88e6123_61_65_setup_port(struct dsa_switch *ds, int p) 


static int mv88e6123_61_65_setup(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int i;

	int ret;

drivers/net/dsa/mv88e6131.c

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int mv88e6131_setup_global(struct dsa_switch *ds) 


static int mv88e6131_setup_port(struct dsa_switch *ds, int p)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int addr = REG_PORT(p);

	u16 val;
@@ -274,7 +274,7 @@ static int mv88e6131_setup_port(struct dsa_switch *ds, int p) 


static int mv88e6131_setup(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int i;

	int ret;

drivers/net/dsa/mv88e6xxx.c

+6 −6
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg) 


int mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	mutex_lock(&ps->smi_mutex);
@@ -118,7 +118,7 @@ int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr, 


int mv88e6xxx_reg_write(struct dsa_switch *ds, int addr, int reg, u16 val)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	mutex_lock(&ps->smi_mutex);
@@ -256,7 +256,7 @@ static void mv88e6xxx_ppu_reenable_timer(unsigned long _ps) 


static int mv88e6xxx_ppu_access_get(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;



	mutex_lock(&ps->ppu_mutex);
@@ -283,7 +283,7 @@ static int mv88e6xxx_ppu_access_get(struct dsa_switch *ds) 


static void mv88e6xxx_ppu_access_put(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);



	/* Schedule a timer to re-enable the PHY polling unit. */

	mod_timer(&ps->ppu_timer, jiffies + msecs_to_jiffies(10));
@@ -292,7 +292,7 @@ static void mv88e6xxx_ppu_access_put(struct dsa_switch *ds) 


void mv88e6xxx_ppu_state_init(struct dsa_switch *ds)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);



	mutex_init(&ps->ppu_mutex);

	INIT_WORK(&ps->ppu_work, mv88e6xxx_ppu_reenable_work);
@@ -463,7 +463,7 @@ void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, 
				 int nr_stats, struct mv88e6xxx_hw_stat *stats,

				 int port, uint64_t *data)

{

	struct mv88e6xxx_priv_state *ps = (void *)(ds + 1);

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int ret;

	int i;