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

Commit ae50b1df authored by Jingoo Han's avatar Jingoo Han Committed by Wolfram Sang
Browse files

i2c: bcm2835: Use devm_ioremap_resource() 



Use devm_ioremap_resource() in order to make the code simpler,
and remove redundant return value check of platform_get_resource()
because the value is checked by devm_ioremap_resource().

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 1b31e9b7

drivers/i2c/busses/i2c-bcm2835.c

+4 −20
Original line number Original line Diff line number Diff line
@@ -219,7 +219,7 @@ static const struct i2c_algorithm bcm2835_i2c_algo = { 
static int bcm2835_i2c_probe(struct platform_device *pdev)

static int bcm2835_i2c_probe(struct platform_device *pdev)

{

{

	struct bcm2835_i2c_dev *i2c_dev;

	struct bcm2835_i2c_dev *i2c_dev;

	struct resource *mem, *requested, *irq;

	struct resource *mem, *irq;

	u32 bus_clk_rate, divider;

	u32 bus_clk_rate, divider;

	int ret;

	int ret;

	struct i2c_adapter *adap;

	struct i2c_adapter *adap;
@@ -234,25 +234,9 @@ static int bcm2835_i2c_probe(struct platform_device *pdev) 
	init_completion(&i2c_dev->completion);

	init_completion(&i2c_dev->completion);





	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!mem) {

	i2c_dev->regs = devm_ioremap_resource(&pdev->dev, mem);

		dev_err(&pdev->dev, "No mem resource\n");

	if (IS_ERR(i2c_dev->regs))

		return -ENODEV;

		return PTR_ERR(i2c_dev->regs);

	}



	requested = devm_request_mem_region(&pdev->dev, mem->start,

					    resource_size(mem),

					    dev_name(&pdev->dev));

	if (!requested) {

		dev_err(&pdev->dev, "Could not claim register region\n");

		return -EBUSY;

	}



	i2c_dev->regs = devm_ioremap(&pdev->dev, mem->start,

				     resource_size(mem));

	if (!i2c_dev->regs) {

		dev_err(&pdev->dev, "Could not map registers\n");

		return -ENOMEM;

	}





	i2c_dev->clk = devm_clk_get(&pdev->dev, NULL);

	i2c_dev->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(i2c_dev->clk)) {

	if (IS_ERR(i2c_dev->clk)) {