Commit 287faa5e authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon: disable rx interrupts in oct_rx_shutdown 



Disable RX interrupts in oct_rx_shutdown(). This way we don't need to
expose the RX IRQ numbers outside the RX module.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a554d48a

drivers/staging/octeon/ethernet-rx.c

+9 −0
Original line number Diff line number Diff line
@@ -495,5 +495,14 @@ void cvm_oct_rx_initialize(void) 


void cvm_oct_rx_shutdown(void)

{

	/* Disable POW interrupt */

	if (OCTEON_IS_MODEL(OCTEON_CN68XX))

		cvmx_write_csr(CVMX_SSO_WQ_INT_THRX(pow_receive_group), 0);

	else

		cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0);



	/* Free the interrupt handler */

	free_irq(OCTEON_IRQ_WORKQ0 + pow_receive_group, cvm_oct_device);



	netif_napi_del(&cvm_oct_napi);

}

drivers/staging/octeon/ethernet.c

+0 −9
Original line number Diff line number Diff line
@@ -853,17 +853,8 @@ static int cvm_oct_remove(struct platform_device *pdev) 
{

	int port;



	/* Disable POW interrupt */

	if (OCTEON_IS_MODEL(OCTEON_CN68XX))

		cvmx_write_csr(CVMX_SSO_WQ_INT_THRX(pow_receive_group), 0);

	else

		cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0);



	cvmx_ipd_disable();



	/* Free the interrupt handler */

	free_irq(OCTEON_IRQ_WORKQ0 + pow_receive_group, cvm_oct_device);



	atomic_inc_return(&cvm_oct_poll_queue_stopping);

	cancel_delayed_work_sync(&cvm_oct_rx_refill_work);