Commit 469d729f authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: add chip allocation helper 



Add an helper function to allocate the chip structure at the beginning
of the probe functions. It will be used to initialize the SMI access.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f8b3ee1

drivers/net/dsa/mv88e6xxx.c

+27 −12
Original line number Diff line number Diff line
@@ -3601,6 +3601,21 @@ static const struct mv88e6xxx_info *mv88e6xxx_lookup_info(unsigned int prod_num) 
	return NULL;

}



static struct mv88e6xxx_priv_state *mv88e6xxx_alloc_chip(struct device *dev)

{

	struct mv88e6xxx_priv_state *ps;



	ps = devm_kzalloc(dev, sizeof(*ps), GFP_KERNEL);

	if (!ps)

		return NULL;



	ps->dev = dev;



	mutex_init(&ps->reg_lock);



	return ps;

}



static const char *mv88e6xxx_drv_probe(struct device *dsa_dev,

				       struct device *host_dev, int sw_addr,

				       void **priv)
@@ -3616,32 +3631,30 @@ static const char *mv88e6xxx_drv_probe(struct device *dsa_dev, 
	if (!bus)

		return NULL;



	ps = mv88e6xxx_alloc_chip(dsa_dev);

	if (!ps)

		return NULL;



	id = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), PORT_SWITCH_ID);

	if (id < 0)

		return NULL;

		goto free;



	prod_num = (id & 0xfff0) >> 4;

	rev = id & 0x000f;



	info = mv88e6xxx_lookup_info(prod_num);

	if (!info)

		return NULL;

		goto free;



	name = info->name;



	ps = devm_kzalloc(dsa_dev, sizeof(*ps), GFP_KERNEL);

	if (!ps)

		return NULL;



	ps->bus = bus;

	ps->sw_addr = sw_addr;

	ps->info = info;

	ps->dev = dsa_dev;

	mutex_init(&ps->reg_lock);



	err = mv88e6xxx_mdio_register(ps, NULL);

	if (err)

		return NULL;

		goto free;



	*priv = ps;
@@ -3649,6 +3662,10 @@ static const char *mv88e6xxx_drv_probe(struct device *dsa_dev, 
		 prod_num, name, rev);



	return name;

free:

	devm_kfree(dsa_dev, ps);



	return NULL;

}



static struct dsa_switch_driver mv88e6xxx_switch_driver = {
@@ -3720,14 +3737,12 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) 
	u32 eeprom_len;

	int err;



	ps = devm_kzalloc(dev, sizeof(*ps), GFP_KERNEL);

	ps = mv88e6xxx_alloc_chip(dev);

	if (!ps)

		return -ENOMEM;



	ps->dev = dev;

	ps->bus = mdiodev->bus;

	ps->sw_addr = mdiodev->addr;

	mutex_init(&ps->reg_lock);



	id = mv88e6xxx_reg_read(ps, REG_PORT(0), PORT_SWITCH_ID);

	if (id < 0)