pinctrl: capri: Make capri_pinctrl_probe static
PATCH 1/1 pinctrl: capri: Make capri_pinctrl_probe static
--- drivers/pinctrl/pinctrl-capri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-capri.c +1 -1
@@ -1390,7 +1390,7 @@ static struct pinctrl_desc capri_pinctrl_desc = { .owner = THIS_MODULE, }; -int __init capri_pinctrl_probe (struct platform_device *pdev) +static int __init capri_pinctrl_probe (struct platform_device *pdev) {struct capri_pinctrl_data *pdata = &capri_pinctrl;struct resource *res;
Signature · 1 line
1.8.1.2
Quoted 11 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>--- drivers/pinctrl/pinctrl-capri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pinctrl/pinctrl-capri.c +0
-0
drivers/pinctrl/pinctrl-capri.c static struct pinctrl_desc capri_pinctrl_desc = { · line 1396
Quoted 8 lines
drivers/pinctrl/pinctrl-capri.c +1
-1@@ -1390,7 +1390,7 @@ static struct pinctrl_desc capri_pinctrl_desc = { .owner = THIS_MODULE, }; -int __init capri_pinctrl_probe (struct platform_device *pdev) +static int __init capri_pinctrl_probe (struct platform_device *pdev) {struct capri_pinctrl_data *pdata = &capri_pinctrl;struct resource *res;
Note that this will collide with the capri->bcm281xx renaming patches.
Linus, Christian, are those patches going in soon?
Thanks,
Sherman
Quoted 7 lines · Sherman Yin
Quoted 3 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>Note that this will collide with the
capri->bcm281xxrenaming patches.Linus, Christian, are those patches going in soon?
I have ACKed it, expecting it to be funneled through ARM SoC.
Yours,
Linus Walleij
Quoted 5 lines · Linus Walleij
Quoted 4 lines · Sherman Yin
Quoted 3 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>
Quoted 8 lines
Quoted 3 lines
Note that this will collide with the
capri->bcm281xxrenaming patches.Linus, Christian, are those patches going in soon?
I have ACKed it, expecting it to be funneled through ARM SoC.
Yours,
Linus Walleij
Linus, just to confirm. the bcm_defconfig portion is the only one going through armsoc right ?
thanks,
csd
Quoted 12 lines · Christian Daudt
Quoted 11 lines · Linus Walleij
Quoted 7 lines · Sherman Yin
Quoted 3 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>Note that this will collide with the
capri->bcm281xxrenaming patches.Linus, Christian, are those patches going in soon?
I have ACKed it, expecting it to be funneled through ARM SoC.
Quoted 8 lines
Quoted 2 lines
Yours,
Linus WalleijLinus, just to confirm. the
bcm_defconfigportion is the only one going through armsoc right ?thanks,
csd
Linus,
Sorry for the noise. I just had a chat with Olof on irc and it is
probably best to revert to v1 and push a single patch through, either through pinctrl or armsoc. If you have further patches for 3.14 could you pull this one in along with it ? If not then I'll ask Olof to pull it in instead.
thanks,
csd
Quoted 22 lines · Christian Daudt
Quoted 12 lines · Christian Daudt
Quoted 11 lines · Linus Walleij
Quoted 7 lines · Sherman Yin
Quoted 3 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>Note that this will collide with the
capri->bcm281xxrenaming patches.Linus, Christian, are those patches going in soon?
I have ACKed it, expecting it to be funneled through ARM SoC.
Quoted 8 lines
Quoted 2 lines
Yours,
Linus WalleijLinus, just to confirm. the
bcm_defconfigportion is the only one going through armsoc right ?thanks,
csd
Quoted 6 lines
Linus,
Sorry for the noise. I just had a chat with Olof on irc and it is
probably best to revert to v1 and push a single patch through, either through pinctrl or armsoc. If you have further patches for 3.14 could you pull this one in along with it ? If not then I'll ask Olof to pull it in instead.
Not quite following, I have ACKed the patches, so please push whatever changes you need done through ARM SoC as this is basically a device tree problem.
Yours,
Linus Walleij