Commit 0720219f authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman
Browse files

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20231020105545.216052-7-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 716a8027

drivers/nvmem/mxs-ocotp.c

+4 −6
Original line number Diff line number Diff line
@@ -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 platform_device *pdev) 
	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 platform_device *pdev) 
	if (ret)

		return ret;



	data = match->data;



	ocotp_config.size = data->size;

	ocotp_config.priv = otp;

	ocotp_config.dev = dev;

drivers/nvmem/stm32-romem.c

+4 −3
Original line number Diff line number Diff line
@@ -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 platform_device *pdev) 


	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);