The patch regulator: cpcap: Remove unneeded init_data setting
has been applied to the regulator tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 2106e9bbffb9d91b2bc1a33c09efadc8cb3906d2 Mon Sep 17 00:00:00 2001 From: Axel Lin <axel....@ingics.com> Date: Sat, 16 Mar 2019 22:35:57 +0800 Subject: [PATCH] regulator: cpcap: Remove unneeded init_data setting This driver is using regulator core's simplified DT parsing code, so regulator will call regulator_of_get_init_data() to get init_data. No need to set config.init_data. In additional, current code does not properly set the init_data setting, so just remove it. Signed-off-by: Axel Lin <axel....@ingics.com> Signed-off-by: Mark Brown <broo...@kernel.org> --- drivers/regulator/cpcap-regulator.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/regulator/cpcap-regulator.c b/drivers/regulator/cpcap-regulator.c index e7dab5c4d1d1..c9d805d7a979 100644 --- a/drivers/regulator/cpcap-regulator.c +++ b/drivers/regulator/cpcap-regulator.c @@ -507,7 +507,6 @@ static int cpcap_regulator_probe(struct platform_device *pdev) struct cpcap_ddata *ddata; const struct of_device_id *match; struct regulator_config config; - struct regulator_init_data init_data; int i; match = of_match_device(of_match_ptr(cpcap_regulator_id_table), @@ -534,10 +533,8 @@ static int cpcap_regulator_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ddata); memset(&config, 0, sizeof(config)); - memset(&init_data, 0, sizeof(init_data)); config.dev = &pdev->dev; config.regmap = ddata->reg; - config.init_data = &init_data; for (i = 0; i < CPCAP_NR_REGULATORS; i++) { const struct cpcap_regulator *regulator = &ddata->soc[i]; -- 2.20.1
