Merge tag 'ovl-update-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

[platform/kernel/linux-starfive.git] / drivers / net / ethernet / ti / cpsw_new.c

diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c
index 15672d0..f779d2e 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw_new.c
+++ b/drivers/net/ethernet/ti/cpsw_new.c
@@ -1244,7 +1244,6 @@ static int cpsw_probe_dt(struct cpsw_common *cpsw)
 
        data->active_slave = 0;
        data->channels = CPSW_MAX_QUEUES;
-       data->ale_entries = CPSW_ALE_NUM_ENTRIES;
        data->dual_emac = true;
        data->bd_ram_size = CPSW_BD_RAM_SIZE;
        data->mac_control = 0;
@@ -1661,12 +1660,10 @@ static int cpsw_dl_switch_mode_set(struct devlink *dl, u32 id,
                for (i = 0; i < cpsw->data.slaves; i++) {
                        struct cpsw_slave *slave = &cpsw->slaves[i];
                        struct net_device *sl_ndev = slave->ndev;
-                       struct cpsw_priv *priv;
 
                        if (!sl_ndev)
                                continue;
 
-                       priv = netdev_priv(sl_ndev);
                        if (switch_en)
                                vlan = cpsw->data.default_vlan;
                        else