This patch adds a remove function in platform_driver to pinctrl_unregister for clean unloading. This makes local struct pinctrl_dev a part of struct bcm281xx_pinctrl_data to be accessed from pdev in remove function.
CC: Sherman Yin <[email protected]> CC: Linus Walleij <[email protected]> Signed-off-by: Pramod Gurav <[email protected]> --- drivers/pinctrl/pinctrl-bcm281xx.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/pinctrl-bcm281xx.c b/drivers/pinctrl/pinctrl-bcm281xx.c index c5ca9e6..63db3b6 100644 --- a/drivers/pinctrl/pinctrl-bcm281xx.c +++ b/drivers/pinctrl/pinctrl-bcm281xx.c @@ -87,7 +87,7 @@ struct bcm281xx_pin_function { */ struct bcm281xx_pinctrl_data { void __iomem *reg_base; - + struct pinctrl_dev *pctl; /* List of all pins */ const struct pinctrl_pin_desc *pins; const unsigned npins; @@ -1400,7 +1400,6 @@ static int __init bcm281xx_pinctrl_probe(struct platform_device *pdev) { struct bcm281xx_pinctrl_data *pdata = &bcm281xx_pinctrl; struct resource *res; - struct pinctrl_dev *pctl; /* So far We can assume there is only 1 bank of registers */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -1427,10 +1426,10 @@ static int __init bcm281xx_pinctrl_probe(struct platform_device *pdev) bcm281xx_pinctrl_desc.pins = bcm281xx_pinctrl.pins; bcm281xx_pinctrl_desc.npins = bcm281xx_pinctrl.npins; - pctl = pinctrl_register(&bcm281xx_pinctrl_desc, + pdata->pctl = pinctrl_register(&bcm281xx_pinctrl_desc, &pdev->dev, pdata); - if (!pctl) { + if (!pdata->pctl) { dev_err(&pdev->dev, "Failed to register pinctrl\n"); return -ENODEV; } @@ -1440,6 +1439,15 @@ static int __init bcm281xx_pinctrl_probe(struct platform_device *pdev) return 0; } +static int bcm281xx_pinctrl_remove(struct platform_device *pdev) +{ + struct bcm281xx_pinctrl_data *pdata = platform_get_drvdata(pdev); + + pinctrl_unregister(pdata->pctl); + + return 0; +} + static struct of_device_id bcm281xx_pinctrl_of_match[] = { { .compatible = "brcm,bcm11351-pinctrl", }, { }, @@ -1451,6 +1459,7 @@ static struct platform_driver bcm281xx_pinctrl_driver = { .owner = THIS_MODULE, .of_match_table = bcm281xx_pinctrl_of_match, }, + .remove = bcm281xx_pinctrl_remove, }; module_platform_driver_probe(bcm281xx_pinctrl_driver, bcm281xx_pinctrl_probe); -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
