Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c003eed7 authored by Ulf Hansson's avatar Ulf Hansson Committed by Linus Walleij
Browse files

pinctrl: nomadik: Convert to modern pm_ops 



Use the SIMPLE_DEV_PM_OPS macro and convert to the modern pm ops.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 131d85bc

drivers/pinctrl/pinctrl-nomadik.c

+9 −8
Original line number Diff line number Diff line
@@ -2036,22 +2036,22 @@ static const struct of_device_id nmk_pinctrl_match[] = { 
};



#ifdef CONFIG_PM_SLEEP

static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state)

static int nmk_pinctrl_suspend(struct device *dev)

{

	struct nmk_pinctrl *npct;



	npct = platform_get_drvdata(pdev);

	npct = dev_get_drvdata(dev);

	if (!npct)

		return -EINVAL;



	return pinctrl_force_sleep(npct->pctl);

}



static int nmk_pinctrl_resume(struct platform_device *pdev)

static int nmk_pinctrl_resume(struct device *dev)

{

	struct nmk_pinctrl *npct;



	npct = platform_get_drvdata(pdev);

	npct = dev_get_drvdata(dev);

	if (!npct)

		return -EINVAL;
@@ -2146,17 +2146,18 @@ static struct platform_driver nmk_gpio_driver = { 
	.probe = nmk_gpio_probe,

};



static SIMPLE_DEV_PM_OPS(nmk_pinctrl_pm_ops,

			nmk_pinctrl_suspend,

			nmk_pinctrl_resume);



static struct platform_driver nmk_pinctrl_driver = {

	.driver = {

		.owner = THIS_MODULE,

		.name = "pinctrl-nomadik",

		.of_match_table = nmk_pinctrl_match,

		.pm = &nmk_pinctrl_pm_ops,

	},

	.probe = nmk_pinctrl_probe,

#ifdef CONFIG_PM_SLEEP

	.suspend = nmk_pinctrl_suspend,

	.resume = nmk_pinctrl_resume,

#endif

};



static int __init nmk_gpio_init(void)