Commit 7fc32b41 authored by Michael Grzeschik's avatar Michael Grzeschik Committed by Jakub Kicinski
Browse files

net: dsa: microchip: ksz8795: move variable assignments from detect to init 



This patch moves all variable assignments to the init function. It
leaves the detect function for its single purpose to detect which chip
version is found.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 68a1b676

drivers/net/dsa/microchip/ksz8795.c

+6 −6
Original line number Diff line number Diff line
@@ -1150,9 +1150,6 @@ static int ksz8795_switch_detect(struct ksz_device *dev) 
	    (id2 != CHIP_ID_94 && id2 != CHIP_ID_95))

		return -ENODEV;



	dev->mib_port_cnt = TOTAL_PORT_NUM;

	dev->phy_port_cnt = SWITCH_PORT_NUM;



	if (id2 == CHIP_ID_95) {

		u8 val;
@@ -1167,9 +1164,6 @@ static int ksz8795_switch_detect(struct ksz_device *dev) 
	id16 |= id2;

	dev->chip_id = id16;



	dev->cpu_port = dev->mib_port_cnt - 1;

	dev->host_mask = BIT(dev->cpu_port);



	return 0;

}
@@ -1244,6 +1238,12 @@ static int ksz8795_switch_init(struct ksz_device *dev) 
	dev->reg_mib_cnt = SWITCH_COUNTER_NUM;

	dev->mib_cnt = TOTAL_SWITCH_COUNTER_NUM;



	dev->mib_port_cnt = TOTAL_PORT_NUM;

	dev->phy_port_cnt = SWITCH_PORT_NUM;



	dev->cpu_port = dev->mib_port_cnt - 1;

	dev->host_mask = BIT(dev->cpu_port);



	i = dev->mib_port_cnt;

	dev->ports = devm_kzalloc(dev->dev, sizeof(struct ksz_port) * i,

				  GFP_KERNEL);