diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2021-05-10 12:58:06 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-05-10 14:47:23 -0700 |
| commit | 692b82c57f71bc755c879ea4eae7fc0eb92cc00b (patch) | |
| tree | 50c2387472d50482939c836bf086d6fbed80665a /drivers/net/ethernet/marvell/mvpp2 | |
| parent | net: mvpp2: Put fwnode in error case during ->probe() (diff) | |
| download | linux-dev-692b82c57f71bc755c879ea4eae7fc0eb92cc00b.tar.xz linux-dev-692b82c57f71bc755c879ea4eae7fc0eb92cc00b.zip | |
net: mvpp2: Use device_get_match_data() helper
Use the device_get_match_data() helper instead of open coding.
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvpp2')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index b48c08829a31..6bfad75c4087 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -7311,7 +7311,6 @@ static int mvpp2_get_sram(struct platform_device *pdev, static int mvpp2_probe(struct platform_device *pdev) { - const struct acpi_device_id *acpi_id; struct fwnode_handle *fwnode = pdev->dev.fwnode; struct fwnode_handle *port_fwnode; struct mvpp2 *priv; @@ -7324,16 +7323,7 @@ static int mvpp2_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - if (has_acpi_companion(&pdev->dev)) { - acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table, - &pdev->dev); - if (!acpi_id) - return -EINVAL; - priv->hw_version = (unsigned long)acpi_id->driver_data; - } else { - priv->hw_version = - (unsigned long)of_device_get_match_data(&pdev->dev); - } + priv->hw_version = (unsigned long)device_get_match_data(&pdev->dev); /* multi queue mode isn't supported on PPV2.1, fallback to single * mode |