Skip to content

Commit

Permalink
net: sparx5: execute sparx5_vcap_init() on lan969x
Browse files Browse the repository at this point in the history
The is_sparx5() check was introduced in an earlier series, to make sure
the sparx5_vcap_init() was not executed on lan969x, as it was not
implemented there yet. Now that it is, remove that check.

Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Reviewed-by: Jens Emil Schulz Østergaard <jensemil.schulzostergaard@microchip.com>
Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Danielmachon authored and Paolo Abeni committed Nov 5, 2024
1 parent 8caa21e commit d4c97e3
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/net/ethernet/microchip/sparx5/sparx5_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -770,12 +770,10 @@ static int sparx5_start(struct sparx5 *sparx5)
if (err)
return err;

if (is_sparx5(sparx5)) {
err = sparx5_vcap_init(sparx5);
if (err) {
sparx5_unregister_notifier_blocks(sparx5);
return err;
}
err = sparx5_vcap_init(sparx5);
if (err) {
sparx5_unregister_notifier_blocks(sparx5);
return err;
}

/* Start Frame DMA with fallback to register based INJ/XTR */
Expand Down

0 comments on commit d4c97e3

Please sign in to comment.