Commit 692b82c5 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller

net: mvpp2: Use device_get_match_data() helper

Use the device_get_match_data() helper instead of open coding.
Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71f0891c
...@@ -7311,7 +7311,6 @@ static int mvpp2_get_sram(struct platform_device *pdev, ...@@ -7311,7 +7311,6 @@ static int mvpp2_get_sram(struct platform_device *pdev,
static int mvpp2_probe(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 *fwnode = pdev->dev.fwnode;
struct fwnode_handle *port_fwnode; struct fwnode_handle *port_fwnode;
struct mvpp2 *priv; struct mvpp2 *priv;
...@@ -7324,16 +7323,7 @@ static int mvpp2_probe(struct platform_device *pdev) ...@@ -7324,16 +7323,7 @@ static int mvpp2_probe(struct platform_device *pdev)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
if (has_acpi_companion(&pdev->dev)) { priv->hw_version = (unsigned long)device_get_match_data(&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);
}
/* multi queue mode isn't supported on PPV2.1, fallback to single /* multi queue mode isn't supported on PPV2.1, fallback to single
* mode * mode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment