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

Commit ac058b33 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "regulator: cpr4-apss: Modify suspend/resume ops"

parents 6b0981b1 6d51fc3f

drivers/regulator/cpr4-apss-regulator.c

+15 −7
Original line number Diff line number Diff line
@@ -1840,20 +1840,29 @@ static int cpr4_apss_init_controller(struct cpr3_controller *ctrl) 
	return 0;

}



static int cpr4_apss_regulator_suspend(struct platform_device *pdev,

				pm_message_t state)

#if CONFIG_PM

static int cpr4_apss_regulator_suspend(struct device *dev)

{

	struct cpr3_controller *ctrl = platform_get_drvdata(pdev);

	struct cpr3_controller *ctrl = dev_get_drvdata(dev);



	return cpr3_regulator_suspend(ctrl);

}



static int cpr4_apss_regulator_resume(struct platform_device *pdev)

static int cpr4_apss_regulator_resume(struct device *dev)

{

	struct cpr3_controller *ctrl = platform_get_drvdata(pdev);

	struct cpr3_controller *ctrl = dev_get_drvdata(dev);



	return cpr3_regulator_resume(ctrl);

}

#else

#define cpr4_apss_regulator_suspend NULL

#define cpr4_apss_regulator_resume NULL

#endif



static const struct dev_pm_ops cpr4_apss_regulator_pm_ops = {

	.suspend	= cpr4_apss_regulator_suspend,

	.resume		= cpr4_apss_regulator_resume,

};



/* Data corresponds to the SoC revision */

static const struct of_device_id cpr4_regulator_match_table[] = {
@@ -1977,11 +1986,10 @@ static struct platform_driver cpr4_apss_regulator_driver = { 
		.name		= "qcom,cpr4-apss-regulator",

		.of_match_table	= cpr4_regulator_match_table,

		.owner		= THIS_MODULE,

		.pm		= &cpr4_apss_regulator_pm_ops,

	},

	.probe		= cpr4_apss_regulator_probe,

	.remove		= cpr4_apss_regulator_remove,

	.suspend	= cpr4_apss_regulator_suspend,

	.resume		= cpr4_apss_regulator_resume,

};



static int cpr4_regulator_init(void)