From 5a511cd33f55e78de7b26eec16874535446bd6c0 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sat, 16 Jun 2012 23:15:37 +0530 Subject: pinctrl/pinctrl-u300: remove devm_kfree at driver unload the memory allocated by devm_kzalloc is automatically freed at the driver detach side, so no neeed of calling devm_kfree Signed-off-by: Devendra Naga Signed-off-by: Linus Walleij --- drivers/pinctrl/pinctrl-u300.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/pinctrl/pinctrl-u300.c') diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c index 05d029911be6..13e7a3eb82e3 100644 --- a/drivers/pinctrl/pinctrl-u300.c +++ b/drivers/pinctrl/pinctrl-u300.c @@ -1183,7 +1183,6 @@ static int __devexit u300_pmx_remove(struct platform_device *pdev) iounmap(upmx->virtbase); release_mem_region(upmx->phybase, upmx->physize); platform_set_drvdata(pdev, NULL); - devm_kfree(&pdev->dev, upmx); return 0; } -- cgit v1.2.3 From 7e1dfe5319de9ab8c73f3934da4debd0fd88c71c Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 19 Jun 2012 14:02:25 +0200 Subject: pinctrl/u300: delete pointless debug print This is some leftover from earlier development, let's get rid of it. Signed-off-by: Linus Walleij --- drivers/pinctrl/pinctrl-u300.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/pinctrl/pinctrl-u300.c') diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c index 13e7a3eb82e3..6cd697a079f9 100644 --- a/drivers/pinctrl/pinctrl-u300.c +++ b/drivers/pinctrl/pinctrl-u300.c @@ -1113,8 +1113,6 @@ static int __devinit u300_pmx_probe(struct platform_device *pdev) int ret; int i; - pr_err("U300 PMX PROBE\n"); - /* Create state holders etc for this driver */ upmx = devm_kzalloc(&pdev->dev, sizeof(*upmx), GFP_KERNEL); if (!upmx) -- cgit v1.2.3 From 5d589b092ab212bbcc27828167e1c036e7fc77d2 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Wed, 23 May 2012 21:22:40 +0800 Subject: pinctrl: remove pinctrl_remove_gpio_range The gpio ranges will be automatically removed when the pinctrl driver is unregistered. Acked-by: Stephen Warren Signed-off-by: Dong Aisheng Signed-off-by: Linus Walleij --- drivers/pinctrl/pinctrl-u300.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/pinctrl/pinctrl-u300.c') diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c index 6cd697a079f9..5f43f9ae36d3 100644 --- a/drivers/pinctrl/pinctrl-u300.c +++ b/drivers/pinctrl/pinctrl-u300.c @@ -1175,8 +1175,6 @@ static int __devexit u300_pmx_remove(struct platform_device *pdev) struct u300_pmx *upmx = platform_get_drvdata(pdev); int i; - for (i = 0; i < ARRAY_SIZE(u300_gpio_ranges); i++) - pinctrl_remove_gpio_range(upmx->pctl, &u300_gpio_ranges[i]); pinctrl_unregister(upmx->pctl); iounmap(upmx->virtbase); release_mem_region(upmx->phybase, upmx->physize); -- cgit v1.2.3 From ebddc88e99f76ddae8c0a82e0461fc04d67d3da2 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 19 Jun 2012 23:39:56 +0200 Subject: pinctrl/u300: drop unused variable The "i" variable was left after the GPIO range cleanup moved to core. Signed-off-by: Linus Walleij --- drivers/pinctrl/pinctrl-u300.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/pinctrl/pinctrl-u300.c') diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c index 5f43f9ae36d3..a7ad8c112d91 100644 --- a/drivers/pinctrl/pinctrl-u300.c +++ b/drivers/pinctrl/pinctrl-u300.c @@ -1173,7 +1173,6 @@ out_no_resource: static int __devexit u300_pmx_remove(struct platform_device *pdev) { struct u300_pmx *upmx = platform_get_drvdata(pdev); - int i; pinctrl_unregister(upmx->pctl); iounmap(upmx->virtbase); -- cgit v1.2.3