mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
i2c: sh_mobile: Use devm_platform_get_and_ioremap_resource()
Convert platform_get_resource(), devm_ioremap_resource() to a single call to devm_platform_get_and_ioremap_resource(), as this is exactly what this function does. Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
parent
8f2056ff20
commit
3735e4318f
1 changed files with 2 additions and 6 deletions
|
@ -871,7 +871,6 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
|
|||
{
|
||||
struct sh_mobile_i2c_data *pd;
|
||||
struct i2c_adapter *adap;
|
||||
struct resource *res;
|
||||
const struct sh_mobile_dt_config *config;
|
||||
int ret;
|
||||
u32 bus_speed;
|
||||
|
@ -893,10 +892,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
|
|||
pd->dev = &dev->dev;
|
||||
platform_set_drvdata(dev, pd);
|
||||
|
||||
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
||||
|
||||
pd->res = res;
|
||||
pd->reg = devm_ioremap_resource(&dev->dev, res);
|
||||
pd->reg = devm_platform_get_and_ioremap_resource(dev, 0, &pd->res);
|
||||
if (IS_ERR(pd->reg))
|
||||
return PTR_ERR(pd->reg);
|
||||
|
||||
|
@ -905,7 +901,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
|
|||
pd->clks_per_count = 1;
|
||||
|
||||
/* Newer variants come with two new bits in ICIC */
|
||||
if (resource_size(res) > 0x17)
|
||||
if (resource_size(pd->res) > 0x17)
|
||||
pd->flags |= IIC_FLAG_HAS_ICIC67;
|
||||
|
||||
pm_runtime_enable(&dev->dev);
|
||||
|
|
Loading…
Reference in a new issue