From patchwork Mon Jul 19 10:16:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin King X-Patchwork-Id: 480234 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACD28C07E9B for ; Mon, 19 Jul 2021 10:16:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 96421610FB for ; Mon, 19 Jul 2021 10:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235709AbhGSJgK (ORCPT ); Mon, 19 Jul 2021 05:36:10 -0400 Received: from smtp-relay-canonical-0.canonical.com ([185.125.188.120]:59188 "EHLO smtp-relay-canonical-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235172AbhGSJgK (ORCPT ); Mon, 19 Jul 2021 05:36:10 -0400 Received: from localhost (1.general.cking.uk.vpn [10.172.193.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 0C496408AC; Mon, 19 Jul 2021 10:16:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626689809; bh=8runyBBXbrVTB4OmD9jQWYsd9Oy2eDL9urVpLTk0xMw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=EfD8xupnn0pq/XmZxl6HjbugwU1uX+XfoNhB49+xyLSCvais7lMas1L24t95ScaBa sgabn7pdeLIec0YBKr/+23qDy4aKLV7zqn6TA7xLqgmZ61ACmiLXsq4bzWSoMHrSoB Gm6rprTO7UasYOnT98LMxuX3bX9XzNzi5KT6JNSLM3aLdF2VmpDlHVbrNHVe+OL0kH rw1L0SkUKZ5Qo8bXkjR2xSL+atwXi3VdkxysvECDRi/6Hs6P8TR7MnfzLyAL58v+jl /bSW+GbnGM8HJedPyBUwZFiIKXH5A/ChhlJSQNQc6AcCAuvQcqpDaWl1JiW0Qf+TxQ c2K7PYysrrEKg== From: Colin King To: Sebastian Reichel , linux-pm@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][RESEND] power: supply: ab8500: clean up warnings found by cppcheck Date: Mon, 19 Jul 2021 11:16:48 +0100 Message-Id: <20210719101648.14497-1-colin.king@canonical.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Colin Ian King Clean up a handful of checkpatch warnings: - static const char * array should probably be static const char * const - function arguments should have identifier names - else should follow close brace '}' - suspect code indent for conditional statements - unnecessary parentheses in an if condition - avoid multiple line dereference - prefer using '"%s...", __func__' to using 'ab8500_chargalg_wd_work' - prefer 'long' over 'long int' as the int is unnecessary Signed-off-by: Colin Ian King --- drivers/power/supply/ab8500_chargalg.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/power/supply/ab8500_chargalg.c b/drivers/power/supply/ab8500_chargalg.c index 46b0c9fedebb..0ba3639778a8 100644 --- a/drivers/power/supply/ab8500_chargalg.c +++ b/drivers/power/supply/ab8500_chargalg.c @@ -123,7 +123,7 @@ enum ab8500_chargalg_states { STATE_WD_EXPIRED, }; -static const char *states[] = { +static const char * const states[] = { "HANDHELD_INIT", "HANDHELD", "CHG_NOT_OK_INIT", @@ -274,8 +274,8 @@ static enum power_supply_property ab8500_chargalg_props[] = { struct ab8500_chargalg_sysfs_entry { struct attribute attr; - ssize_t (*show)(struct ab8500_chargalg *, char *); - ssize_t (*store)(struct ab8500_chargalg *, const char *, size_t); + ssize_t (*show)(struct ab8500_chargalg *di, char *buf); + ssize_t (*store)(struct ab8500_chargalg *di, const char *buf, size_t length); }; /** @@ -526,8 +526,7 @@ static int ab8500_chargalg_kick_watchdog(struct ab8500_chargalg *di) di->usb_chg->ops.kick_wd(di->usb_chg); return di->ac_chg->ops.kick_wd(di->ac_chg); - } - else if (di->usb_chg && di->usb_chg->ops.kick_wd && + } else if (di->usb_chg && di->usb_chg->ops.kick_wd && di->chg_info.online_chg & USB_CHG) return di->usb_chg->ops.kick_wd(di->usb_chg); @@ -750,8 +749,8 @@ static void ab8500_chargalg_check_temp(struct ab8500_chargalg *di) di->t_hyst_norm = 0; di->t_hyst_lowhigh = di->bm->temp_hysteresis; } else { - /* Within hysteresis */ - dev_dbg(di->dev, "Within hysteresis limit temp: %d " + /* Within hysteresis */ + dev_dbg(di->dev, "Within hysteresis limit temp: %d " "hyst_lowhigh %d, hyst normal %d\n", di->batt_data.temp, di->t_hyst_lowhigh, di->t_hyst_norm); @@ -867,7 +866,7 @@ static enum maxim_ret ab8500_chargalg_chg_curr_maxim(struct ab8500_chargalg *di) di->ccm.wait_cnt = 0; - if ((di->batt_data.inst_curr > di->ccm.original_iset)) { + if (di->batt_data.inst_curr > di->ccm.original_iset) { dev_dbg(di->dev, " Maximization Ibat (%dmA) too high" " (limit %dmA) (current iset: %dmA)!\n", di->batt_data.inst_curr, di->ccm.original_iset, @@ -1545,8 +1544,7 @@ static void ab8500_chargalg_algorithm(struct ab8500_chargalg *di) case STATE_WAIT_FOR_RECHARGE: if (di->batt_data.percent <= - di->bm->bat_type[di->bm->batt_id]. - recharge_cap) + di->bm->bat_type[di->bm->batt_id].recharge_cap) ab8500_chargalg_state_to(di, STATE_NORMAL_INIT); break; @@ -1676,7 +1674,7 @@ static void ab8500_chargalg_wd_work(struct work_struct *work) struct ab8500_chargalg *di = container_of(work, struct ab8500_chargalg, chargalg_wd_work.work); - dev_dbg(di->dev, "ab8500_chargalg_wd_work\n"); + dev_dbg(di->dev, "%s\n", __func__); ret = ab8500_chargalg_kick_watchdog(di); if (ret < 0) @@ -1754,7 +1752,7 @@ static ssize_t ab8500_chargalg_curr_step_show(struct ab8500_chargalg *di, static ssize_t ab8500_chargalg_curr_step_store(struct ab8500_chargalg *di, const char *buf, size_t length) { - long int param; + long param; int ret; ret = kstrtol(buf, 10, ¶m); @@ -1787,7 +1785,7 @@ static ssize_t ab8500_chargalg_en_show(struct ab8500_chargalg *di, static ssize_t ab8500_chargalg_en_store(struct ab8500_chargalg *di, const char *buf, size_t length) { - long int param; + long param; int ac_usb; int ret;