net: ks8851: Permit overridding interrupt enable register (d2a1c643) · Commits · 戴 / test

The parallel bus variant does not need to use the TX interrupt at all as it writes the TX FIFO directly with in .ndo_start_xmit, permit the drivers to configure the interrupt enable bits. Reviewed-by:

Andrew Lunn <andrew@lunn.ch> Signed-off-by:

Marek Vasut <marex@denx.de> Cc: David S. Miller <davem@davemloft.net> Cc: Lukas Wunner <lukas@wunner.de> Cc: Petr Stetiar <ynezz@true.cz> Cc: YueHaibing <yuehaibing@huawei.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/micrel/ks8851.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -859,17 +859,8 @@ static int ks8851_net_open(struct net_device *dev)
		ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr);

		/* clear then enable interrupts */

		#define STD_IRQ (IRQ_LCI \| /* Link Change */ \
		IRQ_TXI \| /* TX done */ \
		IRQ_RXI \| /* RX done */ \
		IRQ_SPIBEI \| /* SPI bus error */ \
		IRQ_TXPSI \| /* TX process stop */ \
		IRQ_RXPSI) /* RX process stop */

		ks->rc_ier = STD_IRQ;
		ks8851_wrreg16(ks, KS_ISR, STD_IRQ);
		ks8851_wrreg16(ks, KS_IER, STD_IRQ);
		ks8851_wrreg16(ks, KS_ISR, ks->rc_ier);
		ks8851_wrreg16(ks, KS_IER, ks->rc_ier);

		netif_start_queue(ks->netdev);

		@@ -1599,6 +1590,15 @@ static int ks8851_probe(struct spi_device *spi)
		spi->bits_per_word = 8;

		ks = netdev_priv(netdev);

		#define STD_IRQ (IRQ_LCI \| /* Link Change */ \
		IRQ_TXI \| /* TX done */ \
		IRQ_RXI \| /* RX done */ \
		IRQ_SPIBEI \| /* SPI bus error */ \
		IRQ_TXPSI \| /* TX process stop */ \
		IRQ_RXPSI) /* RX process stop */
		ks->rc_ier = STD_IRQ;

		kss = to_ks8851_spi(ks);

		kss->spidev = spi;

Admin message