mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
rtc: s5m: convert to i2c_new_dummy_device
Move from i2c_new_dummy() to i2c_new_dummy_device(), so we now get an ERRPTR which we use in error handling. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Tested-by: Krzysztof Kozlowski <krzk@kernel.org> Link: https://lore.kernel.org/r/20190722172618.4061-5-wsa+renesas@sang-engineering.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
parent
ca83542cdb
commit
aae364d2a8
@ -760,10 +760,10 @@ static int s5m_rtc_probe(struct platform_device *pdev)
|
|||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
info->i2c = i2c_new_dummy(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
|
info->i2c = i2c_new_dummy_device(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
|
||||||
if (!info->i2c) {
|
if (IS_ERR(info->i2c)) {
|
||||||
dev_err(&pdev->dev, "Failed to allocate I2C for RTC\n");
|
dev_err(&pdev->dev, "Failed to allocate I2C for RTC\n");
|
||||||
return -ENODEV;
|
return PTR_ERR(info->i2c);
|
||||||
}
|
}
|
||||||
|
|
||||||
info->regmap = devm_regmap_init_i2c(info->i2c, regmap_cfg);
|
info->regmap = devm_regmap_init_i2c(info->i2c, regmap_cfg);
|
||||||
|
Loading…
Reference in New Issue
Block a user