evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pinctrl/coh901: convert to use managed resources

Browse source 
This switches the COH 901 pin controller to use managed
resources (devm_*) for memory remaps, clocks, etc.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2012-10-17 18:49:05 +02:00
parent a6c45b99a6
commit 585583f54f
1 changed files with 19 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/pinctrl/pinctrl-coh901.c
View file

@ -65,7 +65,6 @@ struct u300_gpio {
struct gpio_chip chip; struct gpio_chip chip;
struct list_head port_list; struct list_head port_list;
struct clk *clk; struct clk *clk;
struct resource *memres;
void __iomem *base; void __iomem *base;
struct device *dev; struct device *dev;
u32 stride; u32 stride;
@ -663,17 +662,16 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
{ {
struct u300_gpio_platform *plat = dev_get_platdata(&pdev->dev); struct u300_gpio_platform *plat = dev_get_platdata(&pdev->dev);
struct u300_gpio *gpio; struct u300_gpio *gpio;
struct resource *memres;
int err = 0; int err = 0;
int portno; int portno;
u32 val; u32 val;
u32 ifr; u32 ifr;
int i; int i;
gpio = kzalloc(sizeof(struct u300_gpio), GFP_KERNEL); gpio = devm_kzalloc(&pdev->dev, sizeof(struct u300_gpio), GFP_KERNEL);
if (gpio == NULL) { if (gpio == NULL)
dev_err(&pdev->dev, "failed to allocate memory\n");
return -ENOMEM; return -ENOMEM;
}
gpio->chip = u300_gpio_chip; gpio->chip = u300_gpio_chip;
gpio->chip.ngpio = plat->ports * U300_GPIO_PINS_PER_PORT; gpio->chip.ngpio = plat->ports * U300_GPIO_PINS_PER_PORT;
@ -681,37 +679,29 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
gpio->chip.base = plat->gpio_base; gpio->chip.base = plat->gpio_base;
gpio->dev = &pdev->dev; gpio->dev = &pdev->dev;
/* Get GPIO clock */ memres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
gpio->clk = clk_get(gpio->dev, NULL); if (!memres) {
dev_err(gpio->dev, "could not get GPIO memory resource\n");
return -ENODEV;
}
gpio->base = devm_request_and_ioremap(&pdev->dev, memres);
if (!gpio->base) {
dev_err(gpio->dev, "could not get remap memory\n");
return -ENOMEM;
}
gpio->clk = devm_clk_get(gpio->dev, NULL);
if (IS_ERR(gpio->clk)) { if (IS_ERR(gpio->clk)) {
err = PTR_ERR(gpio->clk); err = PTR_ERR(gpio->clk);
dev_err(gpio->dev, "could not get GPIO clock\n"); dev_err(gpio->dev, "could not get GPIO clock\n");
goto err_no_clk; return err;
} }
err = clk_prepare_enable(gpio->clk); err = clk_prepare_enable(gpio->clk);
if (err) { if (err) {
dev_err(gpio->dev, "could not enable GPIO clock\n"); dev_err(gpio->dev, "could not enable GPIO clock\n");
goto err_no_clk_enable; return err;
}
gpio->memres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!gpio->memres) {
dev_err(gpio->dev, "could not get GPIO memory resource\n");
err = -ENODEV;
goto err_no_resource;
}
if (!request_mem_region(gpio->memres->start,
resource_size(gpio->memres),
"GPIO Controller")) {
err = -ENODEV;
goto err_no_ioregion;
}
gpio->base = ioremap(gpio->memres->start, resource_size(gpio->memres));
if (!gpio->base) {
err = -ENOMEM;
goto err_no_ioremap;
} }
dev_info(gpio->dev, dev_info(gpio->dev,
@ -810,16 +800,7 @@ err_no_chip:
err_no_domain: err_no_domain:
err_no_port: err_no_port:
u300_gpio_free_ports(gpio); u300_gpio_free_ports(gpio);
iounmap(gpio->base);
err_no_ioremap:
release_mem_region(gpio->memres->start, resource_size(gpio->memres));
err_no_ioregion:
err_no_resource:
clk_disable_unprepare(gpio->clk); clk_disable_unprepare(gpio->clk);
err_no_clk_enable:
clk_put(gpio->clk);
err_no_clk:
kfree(gpio);
dev_info(&pdev->dev, "module ERROR:%d\n", err); dev_info(&pdev->dev, "module ERROR:%d\n", err);
return err; return err;
} }
@ -838,13 +819,8 @@ static int __exit u300_gpio_remove(struct platform_device *pdev)
return err; return err;
} }
u300_gpio_free_ports(gpio); u300_gpio_free_ports(gpio);
iounmap(gpio->base);
release_mem_region(gpio->memres->start,
resource_size(gpio->memres));
clk_disable_unprepare(gpio->clk); clk_disable_unprepare(gpio->clk);
clk_put(gpio->clk);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(gpio);
return 0; return 0;
} }