[PATCH 05/14] nvmem: nintendo-otp: Use of_device_get_match_data()
From: srini
Date: Sat May 30 2026 - 16:56:19 EST
From: Rosen Penev <rosenp@xxxxxxxxx>
Use of_device_get_match_data() to retrieve the devtype data instead of open-coding the OF match lookup and dereferencing match->data.
This also replaces the deprecated of_device.h include with of.h.
Assisted-by: Codex:GPT-5.5
Signed-off-by: Rosen Penev <rosenp@xxxxxxxxx>
Signed-off-by: Srinivas Kandagatla <srini@xxxxxxxxxx>
---
drivers/nvmem/nintendo-otp.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/nvmem/nintendo-otp.c b/drivers/nvmem/nintendo-otp.c
index 355e7f1fc6d5..e45a8a3a9774 100644
--- a/drivers/nvmem/nintendo-otp.c
+++ b/drivers/nvmem/nintendo-otp.c
@@ -17,7 +17,7 @@
#include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/nvmem-provider.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#define HW_OTPCMD 0
@@ -74,8 +74,7 @@ MODULE_DEVICE_TABLE(of, nintendo_otp_of_table);
static int nintendo_otp_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- const struct of_device_id *of_id =
- of_match_device(nintendo_otp_of_table, dev);
+ const struct nintendo_otp_devtype_data *data;
struct nvmem_device *nvmem;
struct nintendo_otp_priv *priv;
@@ -95,8 +94,8 @@ static int nintendo_otp_probe(struct platform_device *pdev)
if (IS_ERR(priv->regs))
return PTR_ERR(priv->regs);
- if (of_id->data) {
- const struct nintendo_otp_devtype_data *data = of_id->data;
+ data = of_device_get_match_data(dev);
+ if (data) {
config.name = data->name;
config.size = data->num_banks * BANK_SIZE;
}
--
2.53.0