From patchwork Sun Oct 29 15:35:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 831754 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ1sr5JJ9z9t2v for ; Mon, 30 Oct 2017 02:36:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751324AbdJ2Pf6 (ORCPT ); Sun, 29 Oct 2017 11:35:58 -0400 Received: from sauhun.de ([88.99.104.3]:42727 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751167AbdJ2Pf4 (ORCPT ); Sun, 29 Oct 2017 11:35:56 -0400 Received: from localhost (unknown [94.230.152.199]) by pokefinder.org (Postfix) with ESMTPSA id 105392C420F; Sun, 29 Oct 2017 16:35:55 +0100 (CET) From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linux-pm@vger.kernel.org, Phil Reid , sre@kernel.org, Wolfram Sang , Sebastian Reichel Subject: [PATCH 1/3] power: supply: sbs-battery: remove superfluous variable init Date: Sun, 29 Oct 2017 16:35:43 +0100 Message-Id: <20171029153545.3947-2-wsa@the-dreams.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171029153545.3947-1-wsa@the-dreams.de> References: <20171029153545.3947-1-wsa@the-dreams.de> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Those variables are immediately assigned a value afterwards. Reviewed-by: Sebastian Reichel Signed-off-by: Wolfram Sang --- drivers/power/supply/sbs-battery.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index 8dd4bd70c561cc..fb61da370947f4 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -177,10 +177,8 @@ static bool force_load; static int sbs_read_word_data(struct i2c_client *client, u8 address) { struct sbs_info *chip = i2c_get_clientdata(client); + int retries = chip->i2c_retry_count; s32 ret = 0; - int retries = 1; - - retries = chip->i2c_retry_count; while (retries > 0) { ret = i2c_smbus_read_word_data(client, address); @@ -204,7 +202,7 @@ static int sbs_read_string_data(struct i2c_client *client, u8 address, { struct sbs_info *chip = i2c_get_clientdata(client); s32 ret = 0, block_length = 0; - int retries_length = 1, retries_block = 1; + int retries_length, retries_block; u8 block_buffer[I2C_SMBUS_BLOCK_MAX + 1]; retries_length = chip->i2c_retry_count; @@ -269,10 +267,8 @@ static int sbs_write_word_data(struct i2c_client *client, u8 address, u16 value) { struct sbs_info *chip = i2c_get_clientdata(client); + int retries = chip->i2c_retry_count; s32 ret = 0; - int retries = 1; - - retries = chip->i2c_retry_count; while (retries > 0) { ret = i2c_smbus_write_word_data(client, address, value); From patchwork Sun Oct 29 15:35:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 831755 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ1ss65nVz9t2v for ; Mon, 30 Oct 2017 02:36:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751365AbdJ2Pf7 (ORCPT ); Sun, 29 Oct 2017 11:35:59 -0400 Received: from sauhun.de ([88.99.104.3]:42734 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750959AbdJ2Pf5 (ORCPT ); Sun, 29 Oct 2017 11:35:57 -0400 Received: from localhost (unknown [94.230.152.199]) by pokefinder.org (Postfix) with ESMTPSA id 7AC132C4212; Sun, 29 Oct 2017 16:35:55 +0100 (CET) From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linux-pm@vger.kernel.org, Phil Reid , sre@kernel.org, Wolfram Sang , Sebastian Reichel Subject: [PATCH 2/3] power: supply: sbs-battery: remove unchecked return var Date: Sun, 29 Oct 2017 16:35:44 +0100 Message-Id: <20171029153545.3947-3-wsa@the-dreams.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171029153545.3947-1-wsa@the-dreams.de> References: <20171029153545.3947-1-wsa@the-dreams.de> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Since the return value is not checked anyhow, we don't need to store it. Reviewed-by: Sebastian Reichel Signed-off-by: Wolfram Sang --- drivers/power/supply/sbs-battery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index fb61da370947f4..83d7b4115857e3 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -556,7 +556,7 @@ static int sbs_get_battery_serial_number(struct i2c_client *client, if (ret < 0) return ret; - ret = sprintf(sbs_serial, "%04x", ret); + sprintf(sbs_serial, "%04x", ret); val->strval = sbs_serial; return 0; From patchwork Sun Oct 29 15:35:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 831756 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yQ1st3J0nz9t30 for ; Mon, 30 Oct 2017 02:36:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750959AbdJ2PgA (ORCPT ); Sun, 29 Oct 2017 11:36:00 -0400 Received: from sauhun.de ([88.99.104.3]:42738 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751199AbdJ2Pf6 (ORCPT ); Sun, 29 Oct 2017 11:35:58 -0400 Received: from localhost (unknown [94.230.152.199]) by pokefinder.org (Postfix) with ESMTPSA id E54882C4217; Sun, 29 Oct 2017 16:35:56 +0100 (CET) From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linux-pm@vger.kernel.org, Phil Reid , sre@kernel.org, Wolfram Sang , Sebastian Reichel Subject: [PATCH 3/3] power: supply: sbs-message: fix some code style issues Date: Sun, 29 Oct 2017 16:35:45 +0100 Message-Id: <20171029153545.3947-4-wsa@the-dreams.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171029153545.3947-1-wsa@the-dreams.de> References: <20171029153545.3947-1-wsa@the-dreams.de> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Use 'unsigned int' and curly braces for 'else'. Reviewed-by: Sebastian Reichel Signed-off-by: Wolfram Sang --- drivers/power/supply/sbs-manager.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/power/supply/sbs-manager.c b/drivers/power/supply/sbs-manager.c index 3e3ad09c5f11c3..ccb4217b963869 100644 --- a/drivers/power/supply/sbs-manager.c +++ b/drivers/power/supply/sbs-manager.c @@ -193,7 +193,7 @@ static int sbsm_select(struct i2c_mux_core *muxc, u32 chan) return ret; } -static int sbsm_gpio_get_value(struct gpio_chip *gc, unsigned off) +static int sbsm_gpio_get_value(struct gpio_chip *gc, unsigned int off) { struct sbsm_data *data = gpiochip_get_data(gc); int ret; @@ -209,7 +209,7 @@ static int sbsm_gpio_get_value(struct gpio_chip *gc, unsigned off) * This needs to be defined or the GPIO lib fails to register the pin. * But the 'gpio' is always an input. */ -static int sbsm_gpio_direction_input(struct gpio_chip *gc, unsigned off) +static int sbsm_gpio_direction_input(struct gpio_chip *gc, unsigned int off) { return 0; } @@ -229,8 +229,9 @@ static int sbsm_do_alert(struct device *dev, void *d) driver->alert(client, I2C_PROTOCOL_SMBUS_ALERT, 0); else dev_warn(&client->dev, "no driver alert()!\n"); - } else + } else { dev_dbg(&client->dev, "alert with no driver\n"); + } device_unlock(dev); return -EBUSY;