diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-08 13:04:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-08 13:04:40 -0400 |
commit | bf44ce8377316071fc53a1fe07b28f99a37c4462 (patch) | |
tree | b8a41395e58f15a86d0e24cd9d0b4564f2d16cbb | |
parent | 7f46f9c13041c8fde331142791f3994a8fdbec6f (diff) | |
parent | 75c353ecacf54dbcca5e2e4388088893aac0fc34 (diff) |
Merge tag 'pinctrl-fixes-for-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pinctrl fixes from Linus Walleij:
- Move MXS pinctrl registration to poscore_initcall
- Fix up various devm_* managed resources code paths
- Fix one function group in the Nomadik driver
- Update MAINTAINERS
* tag 'pinctrl-fixes-for-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
drivers/pinctrl/pinctrl-nomadik.c: drop devm_kfree of devm_kzalloc'd data
MAINTAINERS: fix a few pinctrl related entries
pinctrl-sirf: remove devm_kfree at error path
pinctrl/nomadik: fix hsi function group list
pinctrl/pinctrl-u300: remove unneeded devm_kfree call
pinctrl: mxs: register driver at postcore_initcall time
-rw-r--r-- | MAINTAINERS | 5 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-imx23.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-imx28.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-nomadik-db8500.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-sirf.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-u300.c | 8 |
7 files changed, 8 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 94b823f71e94..63ce3a38b332 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -5329,14 +5329,15 @@ PIN CONTROL SUBSYSTEM | |||
5329 | M: Linus Walleij <linus.walleij@linaro.org> | 5329 | M: Linus Walleij <linus.walleij@linaro.org> |
5330 | S: Maintained | 5330 | S: Maintained |
5331 | F: drivers/pinctrl/ | 5331 | F: drivers/pinctrl/ |
5332 | F: include/linux/pinctrl/ | ||
5332 | 5333 | ||
5333 | PIN CONTROLLER - ST SPEAR | 5334 | PIN CONTROLLER - ST SPEAR |
5334 | M: Viresh Kumar <viresh.linux@gmail.com> | 5335 | M: Viresh Kumar <viresh.linux@gmail.com> |
5335 | L: spear-devel@list.st.com | 5336 | L: spear-devel@list.st.com |
5336 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 5337 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
5337 | W: http://www.st.com/spear | 5338 | W: http://www.st.com/spear |
5338 | S: Maintained | 5339 | S: Maintained |
5339 | F: driver/pinctrl/spear/ | 5340 | F: drivers/pinctrl/spear/ |
5340 | 5341 | ||
5341 | PKTCDVD DRIVER | 5342 | PKTCDVD DRIVER |
5342 | M: Peter Osterlund <petero2@telia.com> | 5343 | M: Peter Osterlund <petero2@telia.com> |
diff --git a/drivers/pinctrl/pinctrl-imx23.c b/drivers/pinctrl/pinctrl-imx23.c index 75d3eff94296..3674d877ed7c 100644 --- a/drivers/pinctrl/pinctrl-imx23.c +++ b/drivers/pinctrl/pinctrl-imx23.c | |||
@@ -292,7 +292,7 @@ static int __init imx23_pinctrl_init(void) | |||
292 | { | 292 | { |
293 | return platform_driver_register(&imx23_pinctrl_driver); | 293 | return platform_driver_register(&imx23_pinctrl_driver); |
294 | } | 294 | } |
295 | arch_initcall(imx23_pinctrl_init); | 295 | postcore_initcall(imx23_pinctrl_init); |
296 | 296 | ||
297 | static void __exit imx23_pinctrl_exit(void) | 297 | static void __exit imx23_pinctrl_exit(void) |
298 | { | 298 | { |
diff --git a/drivers/pinctrl/pinctrl-imx28.c b/drivers/pinctrl/pinctrl-imx28.c index b973026811a2..0f5b2122b1ba 100644 --- a/drivers/pinctrl/pinctrl-imx28.c +++ b/drivers/pinctrl/pinctrl-imx28.c | |||
@@ -408,7 +408,7 @@ static int __init imx28_pinctrl_init(void) | |||
408 | { | 408 | { |
409 | return platform_driver_register(&imx28_pinctrl_driver); | 409 | return platform_driver_register(&imx28_pinctrl_driver); |
410 | } | 410 | } |
411 | arch_initcall(imx28_pinctrl_init); | 411 | postcore_initcall(imx28_pinctrl_init); |
412 | 412 | ||
413 | static void __exit imx28_pinctrl_exit(void) | 413 | static void __exit imx28_pinctrl_exit(void) |
414 | { | 414 | { |
diff --git a/drivers/pinctrl/pinctrl-nomadik-db8500.c b/drivers/pinctrl/pinctrl-nomadik-db8500.c index 6f99769c6733..5f3e9d0221e1 100644 --- a/drivers/pinctrl/pinctrl-nomadik-db8500.c +++ b/drivers/pinctrl/pinctrl-nomadik-db8500.c | |||
@@ -766,7 +766,7 @@ DB8500_FUNC_GROUPS(ipgpio, "ipgpio0_a_1", "ipgpio1_a_1", "ipgpio7_b_1", | |||
766 | DB8500_FUNC_GROUPS(msp2, "msp2sck_a_1", "msp2_a_1"); | 766 | DB8500_FUNC_GROUPS(msp2, "msp2sck_a_1", "msp2_a_1"); |
767 | DB8500_FUNC_GROUPS(mc4, "mc4_a_1", "mc4rstn_c_1"); | 767 | DB8500_FUNC_GROUPS(mc4, "mc4_a_1", "mc4rstn_c_1"); |
768 | DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1dir_a_1"); | 768 | DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1dir_a_1"); |
769 | DB8500_FUNC_GROUPS(hsi, "hsir1_a_1", "hsit1_a_1", "hsit_a_2"); | 769 | DB8500_FUNC_GROUPS(hsi, "hsir_a_1", "hsit_a_1", "hsit_a_2"); |
770 | DB8500_FUNC_GROUPS(clkout, "clkout_a_1", "clkout_a_2", "clkout_c_1"); | 770 | DB8500_FUNC_GROUPS(clkout, "clkout_a_1", "clkout_a_2", "clkout_c_1"); |
771 | DB8500_FUNC_GROUPS(usb, "usb_a_1"); | 771 | DB8500_FUNC_GROUPS(usb, "usb_a_1"); |
772 | DB8500_FUNC_GROUPS(trig, "trig_b_1"); | 772 | DB8500_FUNC_GROUPS(trig, "trig_b_1"); |
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 53b0d49a7a1c..ec6ac501b23a 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c | |||
@@ -1731,7 +1731,6 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev) | |||
1731 | for (i = 0; i < npct->soc->gpio_num_ranges; i++) { | 1731 | for (i = 0; i < npct->soc->gpio_num_ranges; i++) { |
1732 | if (!nmk_gpio_chips[i]) { | 1732 | if (!nmk_gpio_chips[i]) { |
1733 | dev_warn(&pdev->dev, "GPIO chip %d not registered yet\n", i); | 1733 | dev_warn(&pdev->dev, "GPIO chip %d not registered yet\n", i); |
1734 | devm_kfree(&pdev->dev, npct); | ||
1735 | return -EPROBE_DEFER; | 1734 | return -EPROBE_DEFER; |
1736 | } | 1735 | } |
1737 | npct->soc->gpio_ranges[i].gc = &nmk_gpio_chips[i]->chip; | 1736 | npct->soc->gpio_ranges[i].gc = &nmk_gpio_chips[i]->chip; |
diff --git a/drivers/pinctrl/pinctrl-sirf.c b/drivers/pinctrl/pinctrl-sirf.c index 2aae8a8978e9..7fca6ce5952b 100644 --- a/drivers/pinctrl/pinctrl-sirf.c +++ b/drivers/pinctrl/pinctrl-sirf.c | |||
@@ -1217,7 +1217,6 @@ out_no_rsc_remap: | |||
1217 | iounmap(spmx->gpio_virtbase); | 1217 | iounmap(spmx->gpio_virtbase); |
1218 | out_no_gpio_remap: | 1218 | out_no_gpio_remap: |
1219 | platform_set_drvdata(pdev, NULL); | 1219 | platform_set_drvdata(pdev, NULL); |
1220 | devm_kfree(&pdev->dev, spmx); | ||
1221 | return ret; | 1220 | return ret; |
1222 | } | 1221 | } |
1223 | 1222 | ||
diff --git a/drivers/pinctrl/pinctrl-u300.c b/drivers/pinctrl/pinctrl-u300.c index a7ad8c112d91..309f5b9a70ec 100644 --- a/drivers/pinctrl/pinctrl-u300.c +++ b/drivers/pinctrl/pinctrl-u300.c | |||
@@ -1121,10 +1121,8 @@ static int __devinit u300_pmx_probe(struct platform_device *pdev) | |||
1121 | upmx->dev = &pdev->dev; | 1121 | upmx->dev = &pdev->dev; |
1122 | 1122 | ||
1123 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1123 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
1124 | if (!res) { | 1124 | if (!res) |
1125 | ret = -ENOENT; | 1125 | return -ENOENT; |
1126 | goto out_no_resource; | ||
1127 | } | ||
1128 | upmx->phybase = res->start; | 1126 | upmx->phybase = res->start; |
1129 | upmx->physize = resource_size(res); | 1127 | upmx->physize = resource_size(res); |
1130 | 1128 | ||
@@ -1165,8 +1163,6 @@ out_no_remap: | |||
1165 | platform_set_drvdata(pdev, NULL); | 1163 | platform_set_drvdata(pdev, NULL); |
1166 | out_no_memregion: | 1164 | out_no_memregion: |
1167 | release_mem_region(upmx->phybase, upmx->physize); | 1165 | release_mem_region(upmx->phybase, upmx->physize); |
1168 | out_no_resource: | ||
1169 | devm_kfree(&pdev->dev, upmx); | ||
1170 | return ret; | 1166 | return ret; |
1171 | } | 1167 | } |
1172 | 1168 | ||