Unverified Commit 8f7e17d8 authored by Rob Herring's avatar Rob Herring Committed by Mark Brown
Browse files

regulator: 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>
Link: https://lore.kernel.org/r/20231017203442.2699322-1-robh@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 46537a86

drivers/regulator/lochnagar-regulator.c

+2 −6
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/regulator/driver.h>
@@ -243,7 +242,6 @@ static int lochnagar_regulator_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct lochnagar *lochnagar = dev_get_drvdata(dev->parent);

	struct regulator_config config = { };

	const struct of_device_id *of_id;

	const struct regulator_desc *desc;

	struct regulator_dev *rdev;

	int ret;
@@ -252,12 +250,10 @@ static int lochnagar_regulator_probe(struct platform_device *pdev) 
	config.regmap = lochnagar->regmap;

	config.driver_data = lochnagar;



	of_id = of_match_device(lochnagar_of_match, dev);

	if (!of_id)

	desc = device_get_match_data(dev);

	if (!desc)

		return -EINVAL;



	desc = of_id->data;



	rdev = devm_regulator_register(dev, desc, &config);

	if (IS_ERR(rdev)) {

		ret = PTR_ERR(rdev);

drivers/regulator/palmas-regulator.c

+2 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/regmap.h>

#include <linux/mfd/palmas.h>

#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/regulator/of_regulator.h>



static const struct linear_range smps_low_ranges[] = {
@@ -1601,16 +1600,13 @@ static int palmas_regulators_probe(struct platform_device *pdev) 
	struct regulator_config config = { };

	struct palmas_pmic *pmic;

	const char *pdev_name;

	const struct of_device_id *match;

	int ret = 0;

	unsigned int reg;



	match = of_match_device(of_match_ptr(of_palmas_match_tbl), &pdev->dev);



	if (!match)

	driver_data = (struct palmas_pmic_driver_data *)device_get_match_data(&pdev->dev);

	if (!driver_data)

		return -ENODATA;



	driver_data = (struct palmas_pmic_driver_data *)match->data;

	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

drivers/regulator/qcom-labibb-regulator.c

+3 −4
Original line number Diff line number Diff line
@@ -764,7 +764,6 @@ static int qcom_labibb_regulator_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct regulator_config cfg = {};

	struct device_node *reg_node;

	const struct of_device_id *match;

	const struct labibb_regulator_data *reg_data;

	struct regmap *reg_regmap;

	unsigned int type;
@@ -776,11 +775,11 @@ static int qcom_labibb_regulator_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	match = of_match_device(qcom_labibb_match, &pdev->dev);

	if (!match)

	reg_data = device_get_match_data(&pdev->dev);

	if (!reg_data)

		return -ENODEV;



	for (reg_data = match->data; reg_data->name; reg_data++) {

	for (; reg_data->name; reg_data++) {

		char *sc_irq_name;

		int irq = 0;

drivers/regulator/qcom_rpm-regulator.c

+3 −4
Original line number Diff line number Diff line
@@ -937,7 +937,6 @@ MODULE_DEVICE_TABLE(of, rpm_of_match); 
static int rpm_reg_probe(struct platform_device *pdev)

{

	const struct rpm_regulator_data *reg;

	const struct of_device_id *match;

	struct regulator_config config = { };

	struct regulator_dev *rdev;

	struct qcom_rpm_reg *vreg;
@@ -949,13 +948,13 @@ static int rpm_reg_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	match = of_match_device(rpm_of_match, &pdev->dev);

	if (!match) {

	reg = device_get_match_data(&pdev->dev);

	if (!reg) {

		dev_err(&pdev->dev, "failed to match device\n");

		return -ENODEV;

	}



	for (reg = match->data; reg->name; reg++) {

	for (; reg->name; reg++) {

		vreg = devm_kmemdup(&pdev->dev, reg->template, sizeof(*vreg), GFP_KERNEL);

		if (!vreg)

			return -ENOMEM;

drivers/regulator/qcom_spmi-regulator.c

+3 −4
Original line number Diff line number Diff line
@@ -2468,7 +2468,6 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev) 
{

	const struct spmi_regulator_data *reg;

	const struct spmi_voltage_range *range;

	const struct of_device_id *match;

	struct regulator_config config = { };

	struct regulator_dev *rdev;

	struct spmi_regulator *vreg;
@@ -2491,8 +2490,8 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev) 
	if (!regmap)

		return -ENODEV;



	match = of_match_device(qcom_spmi_regulator_match, &pdev->dev);

	if (!match)

	reg = device_get_match_data(&pdev->dev);

	if (!reg)

		return -ENODEV;



	if (of_find_property(node, "qcom,saw-reg", &lenp)) {
@@ -2503,7 +2502,7 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev) 
			dev_err(dev, "ERROR reading SAW regmap\n");

	}



	for (reg = match->data; reg->name; reg++) {

	for (; reg->name; reg++) {



		if (saw_regmap) {

			reg_node = of_get_child_by_name(node, reg->name);