kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pcnet32: factor out pcnet32_clr_suspend()

Browse source 
Move the code to clear SUSPEND flag to a separate function to simplify
code.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ondrej Zary 2017-02-13 23:45:46 +01:00 committed by David S. Miller
parent 1ca6270b8d
commit cce5fbadb6
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/net/ethernet/amd/pcnet32.c
View file

@ -1108,6 +1108,13 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
return 1;
}
static void pcnet32_clr_suspend(struct pcnet32_private *lp, ulong ioaddr)
{
int csr5 = lp->a->read_csr(ioaddr, CSR5);
/* clear SUSPEND (SPND) - CSR5 bit 0 */
lp->a->write_csr(ioaddr, CSR5, csr5 & ~CSR5_SUSPEND);
}
/*
* process one receive descriptor entry
*/
@ -1425,13 +1432,8 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
}
}
if (!(csr0 & CSR0_STOP)) { /* If not stopped */
int csr5;
/* clear SUSPEND (SPND) - CSR5 bit 0 */
csr5 = a->read_csr(ioaddr, CSR5);
a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
}
if (!(csr0 & CSR0_STOP)) /* If not stopped */
pcnet32_clr_suspend(lp, ioaddr);
spin_unlock_irqrestore(&lp->lock, flags);
}
@ -2675,10 +2677,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
}
if (suspended) {
int csr5;
/* clear SUSPEND (SPND) - CSR5 bit 0 */
csr5 = lp->a->read_csr(ioaddr, CSR5);
lp->a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
pcnet32_clr_suspend(lp, ioaddr);
} else {
lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
pcnet32_restart(dev, CSR0_NORMAL);