| Message ID | 20230323052101.30111-1-lukas.bulwahn@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c34ce2796228c3b00353c173a462debe62ab6265 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ethernet: broadcom/sb1250-mac: clean up after SIBYTE_BCM1x55 removal | expand |
Hi Lukas, This looks OK to me. On Thu Mar 23, 2023 at 6:21 AM CET, Lukas Bulwahn wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > With commit b984d7b56dfc ("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: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- > I looked around on lore.kernel.org and could not find a pending patch from > Thomas Bogendoerfer related to cleaning up this network driver after he > removed the config. So, to be on the safe side, I just sent this quick > clean-up patch. > > drivers/net/ethernet/broadcom/sb1250-mac.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c > index f02facb60fd1..3a6763c5e8b3 100644 > --- a/drivers/net/ethernet/broadcom/sb1250-mac.c > +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c > @@ -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) > -- > 2.17.1 Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com> BR Steen
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 23 Mar 2023 06:21:01 +0100 you wrote: > With commit b984d7b56dfc ("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: Lukas Bulwahn <lukas.bulwahn@gmail.com> > > [...] Here is the summary with links: - ethernet: broadcom/sb1250-mac: clean up after SIBYTE_BCM1x55 removal https://git.kernel.org/netdev/net-next/c/c34ce2796228 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c index f02facb60fd1..3a6763c5e8b3 100644 --- a/drivers/net/ethernet/broadcom/sb1250-mac.c +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c @@ -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)
With commit b984d7b56dfc ("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: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- I looked around on lore.kernel.org and could not find a pending patch from Thomas Bogendoerfer related to cleaning up this network driver after he removed the config. So, to be on the safe side, I just sent this quick clean-up patch. drivers/net/ethernet/broadcom/sb1250-mac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)