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

regulator: Drop unnecessary of_match_device() calls 



If probe is reached, we've already matched the device and in the case of
DT matching, the struct device_node pointer will be set. Therefore, there
is no need to call of_match_device() in probe.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20231017203507.2699826-1-robh@kernel.org


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

drivers/regulator/da9210-regulator.c

+1 −11
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/irq.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/regulator/of_regulator.h>

#include <linux/regmap.h>
@@ -135,16 +135,6 @@ static int da9210_i2c_probe(struct i2c_client *i2c) 
	struct regulator_dev *rdev = NULL;

	struct regulator_config config = { };

	int error;

	const struct of_device_id *match;



	if (i2c->dev.of_node && !pdata) {

		match = of_match_device(of_match_ptr(da9210_dt_ids),

						&i2c->dev);

		if (!match) {

			dev_err(&i2c->dev, "Error: No device match found\n");

			return -ENODEV;

		}

	}



	chip = devm_kzalloc(&i2c->dev, sizeof(struct da9210), GFP_KERNEL);

	if (!chip)

drivers/regulator/max1586.c

+1 −8
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/regulator/driver.h>

#include <linux/slab.h>

#include <linux/regulator/max1586.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/regulator/of_regulator.h>



#define MAX1586_V3_MAX_VSEL 31
@@ -213,16 +213,9 @@ static int max1586_pmic_probe(struct i2c_client *client) 
	struct regulator_config config = { };

	struct max1586_data *max1586;

	int i, id, ret;

	const struct of_device_id *match;



	pdata = dev_get_platdata(&client->dev);

	if (client->dev.of_node && !pdata) {

		match = of_match_device(of_match_ptr(max1586_of_match),

					&client->dev);

		if (!match) {

			dev_err(&client->dev, "Error: No device match found\n");

			return -ENODEV;

		}

		ret = of_get_max1586_platform_data(&client->dev, &pdata_of);

		if (ret < 0)

			return ret;

drivers/regulator/tps51632-regulator.c

+0 −11
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/regulator/driver.h>
@@ -255,16 +254,6 @@ static int tps51632_probe(struct i2c_client *client) 
	int ret;

	struct regulator_config config = { };



	if (client->dev.of_node) {

		const struct of_device_id *match;

		match = of_match_device(of_match_ptr(tps51632_of_match),

				&client->dev);

		if (!match) {

			dev_err(&client->dev, "Error: No device match found\n");

			return -ENODEV;

		}

	}



	tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);

	if (!tps)

		return -ENOMEM;