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

Commit 970d494c authored by Thierry Reding's avatar Thierry Reding Committed by Wolfram Sang
Browse files

i2c: ocores: Use devm_request_and_ioremap() 



Replacing the devm_request_mem_region() and devm_ioremap_nocache() calls
by a single call to devm_request_and_ioremap() simplifies the code.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent 45fd5e4a

drivers/i2c/busses/i2c-ocores.c

+3 −12
Original line number Diff line number Diff line
@@ -283,18 +283,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev) 
	if (!i2c)

		return -ENOMEM;



	if (!devm_request_mem_region(&pdev->dev, res->start,

				     resource_size(res), pdev->name)) {

		dev_err(&pdev->dev, "Memory region busy\n");

		return -EBUSY;

	}



	i2c->base = devm_ioremap_nocache(&pdev->dev, res->start,

					 resource_size(res));

	if (!i2c->base) {

		dev_err(&pdev->dev, "Unable to map registers\n");

		return -EIO;

	}

	i2c->base = devm_request_and_ioremap(&pdev->dev, res);

	if (!i2c->base)

		return -EADDRNOTAVAIL;



	pdata = pdev->dev.platform_data;

	if (pdata) {