Commit 5be50eb5 authored by Rob Herring's avatar Rob Herring Committed by Corey Minyard

ipmi: si: Use device_get_match_data()

Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Message-Id: <20231115210230.3744198-1-robh@kernel.org>
Signed-off-by: default avatarCorey Minyard <minyard@acm.org>
parent ceb6a6f0
...@@ -11,10 +11,11 @@ ...@@ -11,10 +11,11 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of.h>
#include <linux/of_platform.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include "ipmi_si.h" #include "ipmi_si.h"
#include "ipmi_dmi.h" #include "ipmi_dmi.h"
...@@ -224,7 +225,6 @@ MODULE_DEVICE_TABLE(of, of_ipmi_match); ...@@ -224,7 +225,6 @@ MODULE_DEVICE_TABLE(of, of_ipmi_match);
static int of_ipmi_probe(struct platform_device *pdev) static int of_ipmi_probe(struct platform_device *pdev)
{ {
const struct of_device_id *match;
struct si_sm_io io; struct si_sm_io io;
struct resource resource; struct resource resource;
const __be32 *regsize, *regspacing, *regshift; const __be32 *regsize, *regspacing, *regshift;
...@@ -237,10 +237,6 @@ static int of_ipmi_probe(struct platform_device *pdev) ...@@ -237,10 +237,6 @@ static int of_ipmi_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "probing via device tree\n"); dev_info(&pdev->dev, "probing via device tree\n");
match = of_match_device(of_ipmi_match, &pdev->dev);
if (!match)
return -ENODEV;
if (!of_device_is_available(np)) if (!of_device_is_available(np))
return -EINVAL; return -EINVAL;
...@@ -269,7 +265,7 @@ static int of_ipmi_probe(struct platform_device *pdev) ...@@ -269,7 +265,7 @@ static int of_ipmi_probe(struct platform_device *pdev)
} }
memset(&io, 0, sizeof(io)); memset(&io, 0, sizeof(io));
io.si_type = (unsigned long) match->data; io.si_type = (enum si_type)device_get_match_data(&pdev->dev);
io.addr_source = SI_DEVICETREE; io.addr_source = SI_DEVICETREE;
io.irq_setup = ipmi_std_irq_setup; io.irq_setup = ipmi_std_irq_setup;
......
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