Commit ae4c9498 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: dsa: mv88e6xxx: remove chip->evcap_config 



evcap_config is only read and written in mv88e6352_config_eventcap(),
so it makes little sense to store it in the global chip struct. Make
it a local variable instead.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uwep4-00000004ikD-1ZEh@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 578c1eb9

drivers/net/dsa/mv88e6xxx/chip.h

+0 −1
Original line number Diff line number Diff line
@@ -424,7 +424,6 @@ struct mv88e6xxx_chip { 
	struct ptp_clock_info	ptp_clock_info;

	struct delayed_work	tai_event_work;

	struct ptp_pin_desc	pin_config[MV88E6XXX_MAX_GPIO];

	u16 evcap_config;

	u16 enable_count;



	/* Current ingress and egress monitor ports */

drivers/net/dsa/mv88e6xxx/ptp.c

+5 −6
Original line number Diff line number Diff line
@@ -175,17 +175,16 @@ static u64 mv88e6165_ptp_clock_read(struct cyclecounter *cc) 
static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int event,

				     int rising)

{

	u16 global_config;

	u16 evcap_config;

	u16 cap_config;

	int err;



	chip->evcap_config = MV88E6XXX_TAI_CFG_CAP_OVERWRITE |

	evcap_config = MV88E6XXX_TAI_CFG_CAP_OVERWRITE |

		       MV88E6XXX_TAI_CFG_CAP_CTR_START;

	if (!rising)

		chip->evcap_config |= MV88E6XXX_TAI_CFG_EVREQ_FALLING;

		evcap_config |= MV88E6XXX_TAI_CFG_EVREQ_FALLING;



	global_config = chip->evcap_config;

	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_CFG, global_config);

	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_CFG, evcap_config);

	if (err)

		return err;