From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@infradead.org
Cc: arm@kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>, Pavel Machek <pavel@ucw.cz>,
Stanislav Brabec <utx@penguin.cz>,
Eric Miao <eric.y.miao@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>
Subject: [PATCH 05/17] ARM: pxa: remove sharpsl_fatal_check function
Date: Tue, 2 Oct 2012 18:36:44 +0200 [thread overview]
Message-ID: <1349195816-2225-6-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1349195816-2225-1-git-send-email-arnd@arndb.de>
The sharpsl_fatal_check has not been used since Pavel Machek removed
the caller in 99f329a2b "pxa/sharpsl_pm: zaurus c3000 aka spitz: fix
resume". Nobody has complained since 2009, so it's safe to assume we
can just remove the function.
Without this patch, building corgi_defconfig results in:
/home/arnd/linux-arm/arch/arm/mach-pxa/sharpsl_pm.c:693:12: warning: 'sharpsl_fatal_check' defined but not used [-Wunused-function]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Stanislav Brabec <utx@penguin.cz>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
---
arch/arm/mach-pxa/sharpsl_pm.c | 48 ----------------------------------------
1 file changed, 48 deletions(-)
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index bdf4cb8..6c9658f 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -55,7 +55,6 @@
#ifdef CONFIG_PM
static int sharpsl_off_charge_battery(void);
static int sharpsl_check_battery_voltage(void);
-static int sharpsl_fatal_check(void);
#endif
static int sharpsl_check_battery_temp(void);
static int sharpsl_ac_check(void);
@@ -686,53 +685,6 @@ static int corgi_pxa_pm_enter(suspend_state_t state)
return 0;
}
-/*
- * Check for fatal battery errors
- * Fatal returns -1
- */
-static int sharpsl_fatal_check(void)
-{
- int buff[5], temp, i, acin;
-
- dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check entered\n");
-
- /* Check AC-Adapter */
- acin = sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN);
-
- if (acin && (sharpsl_pm.charge_mode == CHRG_ON)) {
- sharpsl_pm.machinfo->charge(0);
- udelay(100);
- sharpsl_pm.machinfo->discharge(1); /* enable discharge */
- mdelay(SHARPSL_WAIT_DISCHARGE_ON);
- }
-
- if (sharpsl_pm.machinfo->discharge1)
- sharpsl_pm.machinfo->discharge1(1);
-
- /* Check battery : check inserting battery ? */
- for (i = 0; i < 5; i++) {
- buff[i] = sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT);
- mdelay(SHARPSL_CHECK_BATTERY_WAIT_TIME_VOLT);
- }
-
- if (sharpsl_pm.machinfo->discharge1)
- sharpsl_pm.machinfo->discharge1(0);
-
- if (acin && (sharpsl_pm.charge_mode == CHRG_ON)) {
- udelay(100);
- sharpsl_pm.machinfo->charge(1);
- sharpsl_pm.machinfo->discharge(0);
- }
-
- temp = get_select_val(buff);
- dev_dbg(sharpsl_pm.dev, "sharpsl_fatal_check: acin: %d, discharge voltage: %d, no discharge: %ld\n", acin, temp, sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT));
-
- if ((acin && (temp < sharpsl_pm.machinfo->fatal_acin_volt)) ||
- (!acin && (temp < sharpsl_pm.machinfo->fatal_noacin_volt)))
- return -1;
- return 0;
-}
-
static int sharpsl_off_charge_error(void)
{
dev_err(sharpsl_pm.dev, "Offline Charger: Error occurred.\n");
--
1.7.10
next prev parent reply other threads:[~2012-10-02 16:41 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1349195816-2225-1-git-send-email-arnd@arndb.de>
2012-10-02 16:36 ` [PATCH 01/17] ARM: shmobile: fix memory size for kota2_defconfig Arnd Bergmann
2012-10-03 0:37 ` Simon Horman
2012-10-04 8:34 ` Arnd Bergmann
2012-10-04 8:58 ` Simon Horman
2012-11-30 22:10 ` Olof Johansson
2012-12-01 0:26 ` Simon Horman
2013-01-07 1:59 ` Simon Horman
2013-01-07 13:33 ` Arnd Bergmann
2013-01-08 0:19 ` Simon Horman
2013-01-08 19:06 ` Arnd Bergmann
2012-10-02 16:36 ` [PATCH 02/17] ARM: shark: fix shark_pci_init return code Arnd Bergmann
2012-10-02 16:36 ` [PATCH 03/17] ARM: pxa: Wunused-result warning in viper board file Arnd Bergmann
2012-10-02 16:50 ` Marc Zyngier
2012-10-02 16:36 ` [PATCH 04/17] ARM: pxa: define palmte2_pxa_keys conditionally Arnd Bergmann
2012-10-03 11:23 ` Marek Vasut
2012-10-02 16:36 ` Arnd Bergmann [this message]
2012-10-08 2:38 ` [PATCH 05/17] ARM: pxa: remove sharpsl_fatal_check function Eric Miao
2012-10-08 3:19 ` Haojian Zhuang
2012-10-02 16:36 ` [PATCH 06/17] ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM Arnd Bergmann
2012-10-03 6:38 ` Igor Grinberg
2012-10-02 16:36 ` [PATCH 07/17] ARM: at91: skip at91_io_desc definition for NOMMU Arnd Bergmann
2012-10-02 18:56 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-04 8:23 ` Arnd Bergmann
2012-10-02 16:36 ` [PATCH 08/17] ARM: at91: unused variable in at91_pm_verify_clocks Arnd Bergmann
2012-10-02 18:55 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-04 8:28 ` Arnd Bergmann
2012-10-04 13:05 ` Jean-Christophe PLAGNIOL-VILLARD
2012-10-02 16:36 ` [PATCH 09/17] ARM: imx: select ARM_CPU_SUSPEND if necessary Arnd Bergmann
2012-10-07 4:12 ` Shawn Guo
2012-10-07 8:33 ` Arnd Bergmann
2012-10-02 16:36 ` [PATCH 10/17] ARM: s3c24xx: fix multiple section mismatch warnings Arnd Bergmann
2012-10-02 16:36 ` [PATCH 11/17] ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok Arnd Bergmann
2012-10-02 16:36 ` [PATCH 12/17] ARM: iop13xx: mark iop13xx_scan_bus as __devinit Arnd Bergmann
2012-10-02 20:08 ` Bjorn Helgaas
2012-10-04 10:32 ` Arnd Bergmann
2012-10-04 14:30 ` Greg KH
2012-10-02 16:36 ` [PATCH 13/17] ARM: iop13xx: fix iq81340sc_atux_map_irq prototype Arnd Bergmann
2012-10-02 16:36 ` [PATCH 14/17] ARM: davinci: don't mark da850_register_cpufreq as __init Arnd Bergmann
2012-10-04 13:18 ` Sekhar Nori
2012-10-02 16:36 ` [PATCH 15/17] ARM: rpc: check device_register return code in ecard_probe Arnd Bergmann
2012-10-02 16:36 ` [PATCH 16/17] ARM: ks8695: __arch_virt_to_dma type handling Arnd Bergmann
2012-10-02 16:36 ` [PATCH 17/17] ARM: soc: dependency warnings for errata Arnd Bergmann
2012-10-02 17:16 ` Stephen Warren
2012-10-03 11:23 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349195816-2225-6-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=eric.y.miao@gmail.com \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=utx@penguin.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®