The patch regulator: act8865: fix ptr_ret.cocci warnings
has been applied to the regulator tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.4 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 1889c6e6ac6e15b3631d7e320f740219aa46504a Mon Sep 17 00:00:00 2001 From: kbuild test robot <l...@intel.com> Date: Wed, 24 Jul 2019 17:22:36 +0800 Subject: [PATCH] regulator: act8865: fix ptr_ret.cocci warnings drivers/regulator/act8865-regulator.c:447:8-14: WARNING: PTR_ERR_OR_ZERO can be used Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Generated by: scripts/coccinelle/api/ptr_ret.cocci Fixes: 2d09a79bf637 ("regulator: act8865: Add support for act8600 charger") CC: Maarten ter Huurne <maar...@treewalker.org> Signed-off-by: kbuild test robot <l...@intel.com> Link: https://lore.kernel.org/r/20190724092236.witxtfmubun25l2t@1905cc33b6dd Signed-off-by: Mark Brown <broo...@kernel.org> --- drivers/regulator/act8865-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c index b515e0785d67..6a90d3c7a452 100644 --- a/drivers/regulator/act8865-regulator.c +++ b/drivers/regulator/act8865-regulator.c @@ -465,7 +465,7 @@ static int act8600_charger_probe(struct device *dev, struct regmap *regmap) charger = devm_power_supply_register(dev, &act8600_charger_desc, &cfg); - return IS_ERR(charger) ? PTR_ERR(charger) : 0; + return PTR_ERR_OR_ZERO(charger); } static int act8865_pmic_probe(struct i2c_client *client, -- 2.20.1
