github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 18:21:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i2c: mpc: Use of_property_read_u32 instead of of_get_property

Browse Source 
"of_property_read_u32()" is preferred to "of_get_property()" for
retrieving u32 from the device tree. Replace it.

Suggested-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Andi Shyti 2023-03-18 00:33:37 +01:00 committed by Wolfram Sang
parent ba085a8d6f
commit be40a3ae71
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/i2c/busses/i2c-mpc.c
View File

@ -770,7 +770,6 @@ static const struct i2c_algorithm mpc_algo = {
static struct i2c_adapter mpc_ops = { static struct i2c_adapter mpc_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.algo = &mpc_algo, .algo = &mpc_algo,
.timeout = HZ,
}; };
static struct i2c_bus_recovery_info fsl_i2c_recovery_info = { static struct i2c_bus_recovery_info fsl_i2c_recovery_info = {
@ -781,11 +780,9 @@ static int fsl_i2c_probe(struct platform_device *op)
{ {
const struct mpc_i2c_data *data; const struct mpc_i2c_data *data;
struct mpc_i2c *i2c; struct mpc_i2c *i2c;
const u32 *prop;
u32 clock = MPC_I2C_CLOCK_LEGACY;
int result = 0;
int plen;
struct clk *clk; struct clk *clk;
int result;
u32 clock;
int err; int err;
i2c = devm_kzalloc(&op->dev, sizeof(*i2c), GFP_KERNEL); i2c = devm_kzalloc(&op->dev, sizeof(*i2c), GFP_KERNEL);
@ -831,10 +828,10 @@ static int fsl_i2c_probe(struct platform_device *op)
if (of_property_read_bool(op->dev.of_node, "fsl,preserve-clocking")) { if (of_property_read_bool(op->dev.of_node, "fsl,preserve-clocking")) {
clock = MPC_I2C_CLOCK_PRESERVE; clock = MPC_I2C_CLOCK_PRESERVE;
} else { } else {
prop = of_get_property(op->dev.of_node, "clock-frequency", result = of_property_read_u32(op->dev.of_node,
&plen); "clock-frequency", &clock);
if (prop && plen == sizeof(u32)) if (result)
clock = *prop; clock = MPC_I2C_CLOCK_LEGACY;
} }
data = device_get_match_data(&op->dev); data = device_get_match_data(&op->dev);
@ -846,12 +843,16 @@ static int fsl_i2c_probe(struct platform_device *op)
mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock); mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock);
} }
prop = of_get_property(op->dev.of_node, "fsl,timeout", &plen); result = of_property_read_u32(op->dev.of_node,
if (prop && plen == sizeof(u32)) { "fsl,timeout", &mpc_ops.timeout);
mpc_ops.timeout = *prop * HZ / 1000000; if (!result) {
mpc_ops.timeout *= HZ / 1000000;
if (mpc_ops.timeout < 5) if (mpc_ops.timeout < 5)
mpc_ops.timeout = 5; mpc_ops.timeout = 5;
} else {
mpc_ops.timeout = HZ;
} }
dev_info(i2c->dev, "timeout %u us\n", mpc_ops.timeout * 1000000 / HZ); dev_info(i2c->dev, "timeout %u us\n", mpc_ops.timeout * 1000000 / HZ);
if (of_property_read_bool(op->dev.of_node, "fsl,i2c-erratum-a004447")) if (of_property_read_bool(op->dev.of_node, "fsl,i2c-erratum-a004447"))