summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-moxart.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-03 16:09:56 +0200
committerMark Brown <broonie@kernel.org>2016-05-03 16:09:56 +0200
commitbc0868c62bb13834b20a864f684cced1f84a2412 (patch)
tree2c382dcd24ac95f4dbf53d238d3161d6171d8a4b /drivers/gpio/gpio-moxart.c
parentregulator: pwm: Try to avoid voltage error in duty cycle calculation (diff)
parentregulator: pwm: Use pwm_get_args() where appropriate (diff)
downloadlinux-bc0868c62bb13834b20a864f684cced1f84a2412.tar.xz
linux-bc0868c62bb13834b20a864f684cced1f84a2412.zip
Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm
Diffstat (limited to 'drivers/gpio/gpio-moxart.c')
-rw-r--r--drivers/gpio/gpio-moxart.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c
index ca604538ebf7..f02d0b490978 100644
--- a/drivers/gpio/gpio-moxart.c
+++ b/drivers/gpio/gpio-moxart.c
@@ -57,13 +57,10 @@ static int moxart_gpio_probe(struct platform_device *pdev)
gc->label = "moxart-gpio";
gc->request = gpiochip_generic_request;
gc->free = gpiochip_generic_free;
- gc->bgpio_data = gc->read_reg(gc->reg_set);
gc->base = 0;
- gc->ngpio = 32;
- gc->parent = dev;
gc->owner = THIS_MODULE;
- ret = gpiochip_add_data(gc, NULL);
+ ret = devm_gpiochip_add_data(dev, gc, NULL);
if (ret) {
dev_err(dev, "%s: gpiochip_add failed\n",
dev->of_node->full_name);