forked from Openwrt/openwrt
78 lines
2.3 KiB
Diff
78 lines
2.3 KiB
Diff
From 0720219f4d34a88a9badb4de70cfad7585687d48 Mon Sep 17 00:00:00 2001
|
|
From: Rob Herring <robh@kernel.org>
|
|
Date: Fri, 20 Oct 2023 11:55:45 +0100
|
|
Subject: [PATCH] nvmem: 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>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20231020105545.216052-7-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/mxs-ocotp.c | 10 ++++------
|
|
drivers/nvmem/stm32-romem.c | 7 ++++---
|
|
2 files changed, 8 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/nvmem/mxs-ocotp.c
|
|
+++ b/drivers/nvmem/mxs-ocotp.c
|
|
@@ -13,8 +13,9 @@
|
|
#include <linux/io.h>
|
|
#include <linux/module.h>
|
|
#include <linux/nvmem-provider.h>
|
|
-#include <linux/of_device.h>
|
|
+#include <linux/of.h>
|
|
#include <linux/platform_device.h>
|
|
+#include <linux/property.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/stmp_device.h>
|
|
|
|
@@ -140,11 +141,10 @@ static int mxs_ocotp_probe(struct platfo
|
|
struct device *dev = &pdev->dev;
|
|
const struct mxs_data *data;
|
|
struct mxs_ocotp *otp;
|
|
- const struct of_device_id *match;
|
|
int ret;
|
|
|
|
- match = of_match_device(dev->driver->of_match_table, dev);
|
|
- if (!match || !match->data)
|
|
+ data = device_get_match_data(dev);
|
|
+ if (!data)
|
|
return -EINVAL;
|
|
|
|
otp = devm_kzalloc(dev, sizeof(*otp), GFP_KERNEL);
|
|
@@ -169,8 +169,6 @@ static int mxs_ocotp_probe(struct platfo
|
|
if (ret)
|
|
return ret;
|
|
|
|
- data = match->data;
|
|
-
|
|
ocotp_config.size = data->size;
|
|
ocotp_config.priv = otp;
|
|
ocotp_config.dev = dev;
|
|
--- a/drivers/nvmem/stm32-romem.c
|
|
+++ b/drivers/nvmem/stm32-romem.c
|
|
@@ -10,7 +10,9 @@
|
|
#include <linux/io.h>
|
|
#include <linux/module.h>
|
|
#include <linux/nvmem-provider.h>
|
|
-#include <linux/of_device.h>
|
|
+#include <linux/of.h>
|
|
+#include <linux/platform_device.h>
|
|
+#include <linux/property.h>
|
|
#include <linux/tee_drv.h>
|
|
|
|
#include "stm32-bsec-optee-ta.h"
|
|
@@ -211,8 +213,7 @@ static int stm32_romem_probe(struct plat
|
|
|
|
priv->lower = 0;
|
|
|
|
- cfg = (const struct stm32_romem_cfg *)
|
|
- of_match_device(dev->driver->of_match_table, dev)->data;
|
|
+ cfg = device_get_match_data(dev);
|
|
if (!cfg) {
|
|
priv->cfg.read_only = true;
|
|
priv->cfg.size = resource_size(res);
|