Commit 7d5af564 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Jakub Kicinski
Browse files

net: dsa: b53: Drop unused "cpu_port" field 



It's set but never used anymore.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3ff26b29

drivers/net/dsa/b53/b53_common.c

+0 −28
Original line number Diff line number Diff line
@@ -2300,7 +2300,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 2,

		.arl_buckets = 1024,

		.imp_port = 5,

		.cpu_port = B53_CPU_PORT_25,

		.duplex_reg = B53_DUPLEX_STAT_FE,

	},

	{
@@ -2311,7 +2310,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 2,

		.arl_buckets = 1024,

		.imp_port = 5,

		.cpu_port = B53_CPU_PORT_25,

		.duplex_reg = B53_DUPLEX_STAT_FE,

	},

	{
@@ -2322,7 +2320,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2336,7 +2333,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2350,7 +2346,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS_9798,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2364,7 +2359,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS_9798,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2379,7 +2373,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_buckets = 1024,

		.vta_regs = B53_VTA_REGS,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,

		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
@@ -2392,7 +2385,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2406,7 +2398,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2420,7 +2411,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS_63XX,

		.duplex_reg = B53_DUPLEX_STAT_63XX,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK_63XX,
@@ -2434,7 +2424,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2448,7 +2437,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2462,7 +2450,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2476,7 +2463,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2490,7 +2476,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2504,7 +2489,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2518,7 +2502,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2533,7 +2516,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 256,

		.imp_port = 8,

		.cpu_port = 8, /* TODO: ports 4, 5, 8 */

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2547,7 +2529,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 1024,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2561,7 +2542,6 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.arl_bins = 4,

		.arl_buckets = 256,

		.imp_port = 8,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
@@ -2587,7 +2567,6 @@ static int b53_switch_init(struct b53_device *dev) 
			dev->vta_regs[2] = chip->vta_regs[2];

			dev->jumbo_pm_reg = chip->jumbo_pm_reg;

			dev->imp_port = chip->imp_port;

			dev->cpu_port = chip->cpu_port;

			dev->num_vlans = chip->vlans;

			dev->num_arl_bins = chip->arl_bins;

			dev->num_arl_buckets = chip->arl_buckets;
@@ -2619,13 +2598,6 @@ static int b53_switch_init(struct b53_device *dev) 
			break;

#endif

		}

	} else if (dev->chip_id == BCM53115_DEVICE_ID) {

		u64 strap_value;



		b53_read48(dev, B53_STAT_PAGE, B53_STRAP_VALUE, &strap_value);

		/* use second IMP port if GMII is enabled */

		if (strap_value & SV_GMII_CTRL_115)

			dev->cpu_port = 5;

	}



	dev->num_ports = fls(dev->enabled_ports);

drivers/net/dsa/b53/b53_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ struct b53_device { 
	/* used ports mask */

	u16 enabled_ports;

	unsigned int imp_port;

	unsigned int cpu_port;



	/* connect specific data */

	u8 current_page;