hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pinctrl fixes for v3.6-rc1: 

- 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJQInDjAAoJEEEQszewGV1zd/EQAJomDXod98OvoZXwtTrKnJw0
 9zfBZs2577a0ytCZonMXxFpSTE4e0+GTNN97dno3ueordOqkA9Jr7Bx9FWi4zyiM
 0XJLmkFwONMOaKWjN6xtEUh7c5SsvwPSgUbIi/8DhcqeCRxsYsdVZjWxfSmgC4hB
 fm+WwvxqxhjklLvy9I+LanaF93k688Penyv8cqnY2Y2lER3tHGZXEtEVWnz0ZWnQ
 Ft7NEf8ms5BueX4QCNfd/vX1j6P0dueHvwl9Qv8oLbddgGP2jFPhEA/iZxGn/7Tv
 w9rayQPBhPnAZv2bVfYN/LsmpQlivEnWRxK2S2llxAeUo+aPebsS1nRL68JQg4dA
 7EFHmX+VBiP2mfXomOb4lJYl/tWIyidlneQ+eqUyY4mim0wF/045FRk7hi/EIqI1
 E6jJxG4d3Becxzvtqpd8jj7iA6QkmmnNUdOP8Ktp8bo+9IQd+ogaf3zyNIQdnuSD
 td/08yAwNmVLqcV7pvhtgwLtArEp2crekT7MF/CTajMiBRa7JsmyB7rNovYvxbeg
 ik/I9cmR2yeu5rAJYQ4w/QpHWYAIFtiGM57rkKodaLW4bptD23KLk7v0zWTwC2WX
 pQG+9Yq8kGW6n6BIAUFA5BJ2HaNN2KsS9zIicocFvu2Aab/Rmq6f5ohHH596pEka
 7Ck3SmvPd3fJfYgHQCpp
 =3cIB
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2012-08-08 20:04:40 +03:00
parent 7f46f9c130 75c353ecac
commit bf44ce8377
7 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MAINTAINERS
View File

@ -5329,14 +5329,15 @@ PIN CONTROL SUBSYSTEM
M: Linus Walleij <linus.walleij@linaro.org> M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained S: Maintained
F: drivers/pinctrl/ F: drivers/pinctrl/
F: include/linux/pinctrl/
PIN CONTROLLER - ST SPEAR PIN CONTROLLER - ST SPEAR
M: Viresh Kumar <viresh.linux@gmail.com> M: Viresh Kumar <viresh.linux@gmail.com>
L: spear-devel@list.st.com L: spear-devel@list.st.com
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://www.st.com/spear W: http://www.st.com/spear
S: Maintained S: Maintained
F: driver/pinctrl/spear/ F: drivers/pinctrl/spear/
PKTCDVD DRIVER PKTCDVD DRIVER
M: Peter Osterlund <petero2@telia.com> M: Peter Osterlund <petero2@telia.com>

2
drivers/pinctrl/pinctrl-imx23.c
View File

@ -292,7 +292,7 @@ static int __init imx23_pinctrl_init(void)
{ {
return platform_driver_register(&imx23_pinctrl_driver); return platform_driver_register(&imx23_pinctrl_driver);
} }
arch_initcall(imx23_pinctrl_init); postcore_initcall(imx23_pinctrl_init);
static void __exit imx23_pinctrl_exit(void) static void __exit imx23_pinctrl_exit(void)
{ {

2
drivers/pinctrl/pinctrl-imx28.c
View File

@ -408,7 +408,7 @@ static int __init imx28_pinctrl_init(void)
{ {
return platform_driver_register(&imx28_pinctrl_driver); return platform_driver_register(&imx28_pinctrl_driver);
} }
arch_initcall(imx28_pinctrl_init); postcore_initcall(imx28_pinctrl_init);
static void __exit imx28_pinctrl_exit(void) static void __exit imx28_pinctrl_exit(void)
{ {

2
drivers/pinctrl/pinctrl-nomadik-db8500.c
View File

@ -766,7 +766,7 @@ DB8500_FUNC_GROUPS(ipgpio, "ipgpio0_a_1", "ipgpio1_a_1", "ipgpio7_b_1",
DB8500_FUNC_GROUPS(msp2, "msp2sck_a_1", "msp2_a_1"); DB8500_FUNC_GROUPS(msp2, "msp2sck_a_1", "msp2_a_1");
DB8500_FUNC_GROUPS(mc4, "mc4_a_1", "mc4rstn_c_1"); DB8500_FUNC_GROUPS(mc4, "mc4_a_1", "mc4rstn_c_1");
DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1dir_a_1"); DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1dir_a_1");
DB8500_FUNC_GROUPS(hsi, "hsir1_a_1", "hsit1_a_1", "hsit_a_2"); DB8500_FUNC_GROUPS(hsi, "hsir_a_1", "hsit_a_1", "hsit_a_2");
DB8500_FUNC_GROUPS(clkout, "clkout_a_1", "clkout_a_2", "clkout_c_1"); DB8500_FUNC_GROUPS(clkout, "clkout_a_1", "clkout_a_2", "clkout_c_1");
DB8500_FUNC_GROUPS(usb, "usb_a_1"); DB8500_FUNC_GROUPS(usb, "usb_a_1");
DB8500_FUNC_GROUPS(trig, "trig_b_1"); DB8500_FUNC_GROUPS(trig, "trig_b_1");

1
drivers/pinctrl/pinctrl-nomadik.c
View File

@ -1731,7 +1731,6 @@ static int __devinit nmk_pinctrl_probe(struct platform_device *pdev)
for (i = 0; i < npct->soc->gpio_num_ranges; i++) { for (i = 0; i < npct->soc->gpio_num_ranges; i++) {
if (!nmk_gpio_chips[i]) { if (!nmk_gpio_chips[i]) {
dev_warn(&pdev->dev, "GPIO chip %d not registered yet\n", i); dev_warn(&pdev->dev, "GPIO chip %d not registered yet\n", i);
devm_kfree(&pdev->dev, npct);
return -EPROBE_DEFER; return -EPROBE_DEFER;
} }
npct->soc->gpio_ranges[i].gc = &nmk_gpio_chips[i]->chip; npct->soc->gpio_ranges[i].gc = &nmk_gpio_chips[i]->chip;

1
drivers/pinctrl/pinctrl-sirf.c
View File

@ -1217,7 +1217,6 @@ out_no_rsc_remap:
iounmap(spmx->gpio_virtbase); iounmap(spmx->gpio_virtbase);
out_no_gpio_remap: out_no_gpio_remap:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
devm_kfree(&pdev->dev, spmx);
return ret; return ret;
} }

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

@ -1121,10 +1121,8 @@ static int __devinit u300_pmx_probe(struct platform_device *pdev)
upmx->dev = &pdev->dev; upmx->dev = &pdev->dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) { if (!res)
ret = -ENOENT; return -ENOENT;
goto out_no_resource;
}
upmx->phybase = res->start; upmx->phybase = res->start;
upmx->physize = resource_size(res); upmx->physize = resource_size(res);
@ -1165,8 +1163,6 @@ out_no_remap:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
out_no_memregion: out_no_memregion:
release_mem_region(upmx->phybase, upmx->physize); release_mem_region(upmx->phybase, upmx->physize);
out_no_resource:
devm_kfree(&pdev->dev, upmx);
return ret; return ret;
} }