Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 03:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: sunxi: Switch to devm_ioremap_resource

Browse Source 
The previous code was calling of_iomap, which doesn't do any resource
management, and doesn't call request_mem_region either. Use
devm_ioremap_resource that do both.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Maxime Ripard 2014-04-26 21:59:50 +02:00
parent d10acc6353
commit 4409cafc1a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pinctrl/sunxi/pinctrl-sunxi.c
View File

@ -794,6 +794,7 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)
struct pinctrl_pin_desc *pins; struct pinctrl_pin_desc *pins;
struct sunxi_pinctrl *pctl; struct sunxi_pinctrl *pctl;
struct reset_control *rstc; struct reset_control *rstc;
struct resource *res;
int i, ret, last_pin; int i, ret, last_pin;
struct clk *clk; struct clk *clk;
@ -804,9 +805,10 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)
spin_lock_init(&pctl->lock); spin_lock_init(&pctl->lock);
pctl->membase = of_iomap(node, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!pctl->membase) pctl->membase = devm_ioremap_resource(&pdev->dev, res);
return -ENOMEM; if (IS_ERR(pctl->membase))
return PTR_ERR(pctl->membase);
device = of_match_device(sunxi_pinctrl_match, &pdev->dev); device = of_match_device(sunxi_pinctrl_match, &pdev->dev);
if (!device) if (!device)