Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54108e56 authored by Jan Glauber's avatar Jan Glauber Committed by Wolfram Sang
Browse files

i2c: octeon: Cleanup resource allocation code 



Remove resource values from struct i2c_octeon and use
devm_ioremap_resource helper.

Signed-off-by: default avatarJan Glauber <jglauber@cavium.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent dfcd8212

drivers/i2c/busses/i2c-octeon.c

+3 −15
Original line number Diff line number Diff line
@@ -75,9 +75,7 @@ struct octeon_i2c { 
	int irq;

	u32 twsi_freq;

	int sys_freq;

	resource_size_t twsi_phys;

	void __iomem *twsi_base;

	resource_size_t regsize;

	struct device *dev;

};
@@ -502,14 +500,11 @@ static int octeon_i2c_probe(struct platform_device *pdev) 
	i2c->dev = &pdev->dev;



	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	if (res_mem == NULL) {

		dev_err(i2c->dev, "found no memory resource\n");

		result = -ENXIO;

	i2c->twsi_base = devm_ioremap_resource(&pdev->dev, res_mem);

	if (IS_ERR(i2c->twsi_base)) {

		result = PTR_ERR(i2c->twsi_base);

		goto out;

	}

	i2c->twsi_phys = res_mem->start;

	i2c->regsize = resource_size(res_mem);



	/*

	 * "clock-rate" is a legacy binding, the official binding is
@@ -526,13 +521,6 @@ static int octeon_i2c_probe(struct platform_device *pdev) 


	i2c->sys_freq = octeon_get_io_clock_rate();



	if (!devm_request_mem_region(&pdev->dev, i2c->twsi_phys, i2c->regsize,

				     res_mem->name)) {

		dev_err(i2c->dev, "request_mem_region failed\n");

		goto out;

	}

	i2c->twsi_base = devm_ioremap(&pdev->dev, i2c->twsi_phys, i2c->regsize);



	init_waitqueue_head(&i2c->queue);



	i2c->irq = irq;