From patchwork Thu Sep 4 12:01:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 4844951 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A22679F50F for ; Thu, 4 Sep 2014 12:03:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80F952026F for ; Thu, 4 Sep 2014 12:03:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E9552026D for ; Thu, 4 Sep 2014 12:03:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754002AbaIDMDM (ORCPT ); Thu, 4 Sep 2014 08:03:12 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:42803 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753774AbaIDMDL (ORCPT ); Thu, 4 Sep 2014 08:03:11 -0400 Received: by mail-pa0-f45.google.com with SMTP id bj1so19703959pad.4 for ; Thu, 04 Sep 2014 05:03:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=uB1jRAsh1tWXhbeJsuQp+1Qmaqa9THkDsjXSf4lvgOw=; b=S3BIpLdBBLW/vW44VqGKZDBrj7Pb0jBBm1U9Pe5AjFA3sCHQasmX1fA6rmbXvSYNcH /xvjMPjZ6jMikwe4RcpmamgsdjNcU4+lxXUWEcaUwBwJ+Kz6J7HSuAVrh39HwCX6HhzU B6pTIQqb+QYGnBtepWsaiJTITMEvXEYNQh9ijcsBkhckneai89P9Sg/ZRmddTvwKGzco AlD243BllDi6RMT9gKEA7ai2g8aRmj1HH8LGvHYSH/jHRN5ztHtz1XZbVJ72JnbsUGdP LY3w+qgECYs8Zu4EeLoPUy3DMBxZXw5LquXa49bEb1tzgQS0+VOlVzyGYztpVzL8Tbk+ FR4w== X-Gm-Message-State: ALoCoQnL2wiX5/4zBPgPbDsNz6ZbJNobQT4pMnrV9bXJA6NrKCMJtjfySXzKBVsoAif64UvStAgo X-Received: by 10.66.167.105 with SMTP id zn9mr7802437pab.103.1409832189075; Thu, 04 Sep 2014 05:03:09 -0700 (PDT) Received: from localhost ([122.167.123.172]) by mx.google.com with ESMTPSA id c6sm1527873pbu.59.2014.09.04.05.03.07 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Sep 2014 05:03:08 -0700 (PDT) From: Viresh Kumar To: sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org, anton@enomsg.org Cc: linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, Viresh Kumar Subject: [PATCH 13/15] power-supply: Check for failures only when we can fail Date: Thu, 4 Sep 2014 17:31:34 +0530 Message-Id: X-Mailer: git-send-email 2.0.3.693.g996b0fd In-Reply-To: <2eacd908a8094887cc1796f75ae0513be8a3e36d.1409831636.git.viresh.kumar@linaro.org> References: <2eacd908a8094887cc1796f75ae0513be8a3e36d.1409831636.git.viresh.kumar@linaro.org> In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In power_supply_show_property() routine, we call ->get_property() conditionally and should check for failure in that case only. There is no point comparing 'ret' for errors when 'ret' is surely zero. Signed-off-by: Viresh Kumar --- drivers/power/power_supply_sysfs.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 750a202..c23b1b2 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -73,19 +73,20 @@ static ssize_t power_supply_show_property(struct device *dev, const ptrdiff_t off = attr - power_supply_attrs; union power_supply_propval value; - if (off == POWER_SUPPLY_PROP_TYPE) + if (off == POWER_SUPPLY_PROP_TYPE) { value.intval = psy->type; - else + } else { ret = psy->get_property(psy, off, &value); - if (ret < 0) { - if (ret == -ENODATA) - dev_dbg(dev, "driver has no data for `%s' property\n", - attr->attr.name); - else if (ret != -ENODEV) - dev_err(dev, "driver failed to report `%s' property: %zd\n", - attr->attr.name, ret); - return ret; + if (ret < 0) { + if (ret == -ENODATA) + dev_dbg(dev, "driver has no data for `%s' property\n", + attr->attr.name); + else if (ret != -ENODEV) + dev_err(dev, "driver failed to report `%s' property: %zd\n", + attr->attr.name, ret); + return ret; + } } if (off == POWER_SUPPLY_PROP_STATUS)