Commit c34ce279 authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by David S. Miller
Browse files

ethernet: broadcom/sb1250-mac: clean up after SIBYTE_BCM1x55 removal 



With commit b984d7b5 ("MIPS: sibyte: Remove unused config option
SIBYTE_BCM1x55"), some #if's in the Broadcom SiByte SOC built-in Ethernet
driver can be simplified.

Simplify prepreprocessor conditions after config SIBYTE_BCM1x55 removal.

Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Reviewed-by: default avatarSteen Hegelund <Steen.Hegelund@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2df9bf4d

drivers/net/ethernet/broadcom/sb1250-mac.c

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); 


#include <asm/sibyte/board.h>

#include <asm/sibyte/sb1250.h>

#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

#if defined(CONFIG_SIBYTE_BCM1x80)

#include <asm/sibyte/bcm1480_regs.h>

#include <asm/sibyte/bcm1480_int.h>

#define R_MAC_DMA_OODPKTLOST_RX	R_MAC_DMA_OODPKTLOST
@@ -87,7 +87,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value"); 
#include <asm/sibyte/sb1250_mac.h>

#include <asm/sibyte/sb1250_dma.h>



#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

#if defined(CONFIG_SIBYTE_BCM1x80)

#define UNIT_INT(n)		(K_BCM1480_INT_MAC_0 + ((n) * 2))

#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)

#define UNIT_INT(n)		(K_INT_MAC_0 + (n))
@@ -1527,7 +1527,7 @@ static void sbmac_channel_start(struct sbmac_softc *s) 
	 * Turn on the rest of the bits in the enable register

	 */



#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)

#if defined(CONFIG_SIBYTE_BCM1x80)

	__raw_writeq(M_MAC_RXDMA_EN0 |

		       M_MAC_TXDMA_EN0, s->sbm_macenable);

#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)