diff options
| author | Rob Herring <robh@kernel.org> | 2023-10-06 17:46:44 -0500 |
|---|---|---|
| committer | Neil Armstrong <neil.armstrong@linaro.org> | 2023-10-09 10:48:15 +0200 |
| commit | 5d59b6a49bb8f6841acf53affc0c4720fe7450e5 (patch) | |
| tree | 63b08058287dbf7fceff21a70ea90a02a033d10c /drivers/firmware | |
| parent | 0d423c4a78984dd02f6596d6fd9dd40446eec517 (diff) | |
firmware: meson: 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: Rob Herring <robh@kernel.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20231006224644.445295-1-robh@kernel.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/meson/meson_sm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c index 53bf56e18743..ed60f1103053 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -13,9 +13,10 @@ #include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/printk.h> +#include <linux/property.h> #include <linux/types.h> #include <linux/sizes.h> #include <linux/slab.h> @@ -297,7 +298,7 @@ static int __init meson_sm_probe(struct platform_device *pdev) if (!fw) return -ENOMEM; - chip = of_match_device(meson_sm_ids, dev)->data; + chip = device_get_match_data(dev); if (!chip) return -EINVAL; |