diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2014-09-04 14:01:33 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-09-16 11:01:36 +0200 |
| commit | 9d2410c79b5b2dd741648de26ad52ffd2ce3dc01 (patch) | |
| tree | 857d401fb979d740b15faefc681d83468b128a5a /drivers/power | |
| parent | power-supply: Mark 'if' blocks in power_supply_changed_work() with 'likely' (diff) | |
| download | linux-9d2410c79b5b2dd741648de26ad52ffd2ce3dc01.tar.xz linux-9d2410c79b5b2dd741648de26ad52ffd2ce3dc01.zip | |
power-supply: Use PTR_ERR_OR_ZERO() routine
At multiple places we are doing exactly what PTR_ERR_OR_ZERO() does. And so that
routine can be reused instead of increasing lines of code here.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/power_supply_core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 26518c8218ea..376464e33fc8 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -435,9 +435,7 @@ static int psy_register_thermal(struct power_supply *psy) if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { psy->tzd = thermal_zone_device_register(psy->name, 0, 0, psy, &psy_tzd_ops, NULL, 0, 0); - if (IS_ERR(psy->tzd)) - return PTR_ERR(psy->tzd); - break; + return PTR_ERR_OR_ZERO(psy->tzd); } } return 0; @@ -515,9 +513,7 @@ static int psy_register_cooler(struct power_supply *psy) psy->tcd = thermal_cooling_device_register( (char *)psy->name, psy, &psy_tcd_ops); - if (IS_ERR(psy->tcd)) - return PTR_ERR(psy->tcd); - break; + return PTR_ERR_OR_ZERO(psy->tcd); } } return 0; |