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

Commit 3aebfc9b authored by Laxman Dewangan's avatar Laxman Dewangan
Browse files

gpio: pcf857x: Use devm_gpiochip_add_data() for gpio registration 



Use devm_gpiochip_add_data() for GPIO registration and clean the
error path.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
parent 0ece84f5

drivers/gpio/gpio-pcf857x.c

+3 −7
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static int pcf857x_probe(struct i2c_client *client, 
	gpio->out = ~n_latch;

	gpio->status = gpio->out;



	status = gpiochip_add_data(&gpio->chip, gpio);

	status = devm_gpiochip_add_data(&client->dev, &gpio->chip, gpio);

	if (status < 0)

		goto fail;
@@ -383,7 +383,7 @@ static int pcf857x_probe(struct i2c_client *client, 
					      IRQ_TYPE_NONE);

		if (status) {

			dev_err(&client->dev, "cannot add irqchip\n");

			goto fail_irq;

			goto fail;

		}



		status = devm_request_threaded_irq(&client->dev, client->irq,
@@ -391,7 +391,7 @@ static int pcf857x_probe(struct i2c_client *client, 
					IRQF_TRIGGER_FALLING | IRQF_SHARED,

					dev_name(&client->dev), gpio);

		if (status)

			goto fail_irq;

			goto fail;



		gpiochip_set_chained_irqchip(&gpio->chip, &pcf857x_irq_chip,

					     client->irq, NULL);
@@ -413,9 +413,6 @@ static int pcf857x_probe(struct i2c_client *client, 


	return 0;



fail_irq:

	gpiochip_remove(&gpio->chip);



fail:

	dev_dbg(&client->dev, "probe error %d for '%s'\n", status,

		client->name);
@@ -440,7 +437,6 @@ static int pcf857x_remove(struct i2c_client *client) 
		}

	}



	gpiochip_remove(&gpio->chip);

	return status;

}