Merge tag 'pwm/for-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[linux-2.6-microblaze.git] / drivers / net / ethernet / broadcom / bnx2.c

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 5bace8a..bee6cfa 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -572,7 +572,7 @@ bnx2_write_phy(struct bnx2 *bp, u32 reg, u32 val)
        }
 
        if (val1 & BNX2_EMAC_MDIO_COMM_START_BUSY)
-               ret = -EBUSY;
+               ret = -EBUSY;
        else
                ret = 0;
 
@@ -3599,7 +3599,7 @@ bnx2_set_rx_mode(struct net_device *dev)
                for (i = 0; i < NUM_MC_HASH_REGISTERS; i++) {
                        BNX2_WR(bp, BNX2_EMAC_MULTICAST_HASH0 + (i * 4),
                                0xffffffff);
-               }
+               }
                sort_mode |= BNX2_RPM_SORT_USER0_MC_EN;
        }
        else {
@@ -4674,7 +4674,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,
 
                                if (addr == page_end-4) {
                                        cmd_flags = BNX2_NVM_COMMAND_LAST;
-                               }
+                               }
                                rc = bnx2_nvram_write_dword(bp, addr,
                                        &flash_buffer[i], cmd_flags);