|
@@ -151,31 +151,19 @@ static int da9055_gpio_probe(struct platform_device *pdev)
|
|
|
if (pdata && pdata->gpio_base)
|
|
|
gpio->gp.base = pdata->gpio_base;
|
|
|
|
|
|
- ret = gpiochip_add_data(&gpio->gp, gpio);
|
|
|
+ ret = devm_gpiochip_add_data(&pdev->dev, &gpio->gp, gpio);
|
|
|
if (ret < 0) {
|
|
|
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
|
|
|
- goto err_mem;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
platform_set_drvdata(pdev, gpio);
|
|
|
|
|
|
return 0;
|
|
|
-
|
|
|
-err_mem:
|
|
|
- return ret;
|
|
|
-}
|
|
|
-
|
|
|
-static int da9055_gpio_remove(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct da9055_gpio *gpio = platform_get_drvdata(pdev);
|
|
|
-
|
|
|
- gpiochip_remove(&gpio->gp);
|
|
|
- return 0;
|
|
|
}
|
|
|
|
|
|
static struct platform_driver da9055_gpio_driver = {
|
|
|
.probe = da9055_gpio_probe,
|
|
|
- .remove = da9055_gpio_remove,
|
|
|
.driver = {
|
|
|
.name = "da9055-gpio",
|
|
|
},
|