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

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

net: dsa: bcm_sf2: factor interrupt disabling in a function 



Factor the interrupt disabling in a function: bcm_sf2_intr_disable()
since we are doing the same thing in the setup and suspend paths.

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

drivers/net/dsa/bcm_sf2.c

+12 −12
Original line number Diff line number Diff line
@@ -400,6 +400,16 @@ static int bcm_sf2_sw_rst(struct bcm_sf2_priv *priv) 
	return 0;

}



static void bcm_sf2_intr_disable(struct bcm_sf2_priv *priv)

{

	intrl2_0_writel(priv, 0xffffffff, INTRL2_CPU_MASK_SET);

	intrl2_0_writel(priv, 0xffffffff, INTRL2_CPU_CLEAR);

	intrl2_0_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);

	intrl2_1_writel(priv, 0xffffffff, INTRL2_CPU_MASK_SET);

	intrl2_1_writel(priv, 0xffffffff, INTRL2_CPU_CLEAR);

	intrl2_1_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);

}



static int bcm_sf2_sw_setup(struct dsa_switch *ds)

{

	const char *reg_names[BCM_SF2_REGS_NUM] = BCM_SF2_REGS_NAME;
@@ -440,12 +450,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) 
	}



	/* Disable all interrupts and request them */

	intrl2_0_writel(priv, 0xffffffff, INTRL2_CPU_MASK_SET);

	intrl2_0_writel(priv, 0xffffffff, INTRL2_CPU_CLEAR);

	intrl2_0_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);

	intrl2_1_writel(priv, 0xffffffff, INTRL2_CPU_MASK_SET);

	intrl2_1_writel(priv, 0xffffffff, INTRL2_CPU_CLEAR);

	intrl2_1_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);

	bcm_sf2_intr_disable(priv);



	ret = request_irq(priv->irq0, bcm_sf2_switch_0_isr, 0,

			  "switch_0", priv);
@@ -747,12 +752,7 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds) 
	struct bcm_sf2_priv *priv = ds_to_priv(ds);

	unsigned int port;



	intrl2_0_writel(priv, 0xffffffff, INTRL2_CPU_MASK_SET);

	intrl2_0_writel(priv, 0xffffffff, INTRL2_CPU_CLEAR);

	intrl2_0_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);

	intrl2_1_writel(priv, 0xffffffff, INTRL2_CPU_MASK_SET);

	intrl2_1_writel(priv, 0xffffffff, INTRL2_CPU_CLEAR);

	intrl2_1_writel(priv, 0, INTRL2_CPU_MASK_CLEAR);

	bcm_sf2_intr_disable(priv);



	/* Disable all ports physically present including the IMP

	 * port, the other ones have already been disabled during