From: Lee Jones <lee.jones@linaro.org>
To: Guenter Roeck <linux@roeck-us.net>
Cc: linux-m32r-ja@ml.linux-m32r.org, linux-mips@linux-mips.org,
linux-efi@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-xtensa@linux-xtensa.org, devel@driverdev.osuosl.org,
linux-s390@vger.kernel.org, lguest@lists.ozlabs.org,
linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org,
linux-sh@vger.kernel.org, linux-acpi@vger.kernel.org,
xen-devel@lists.xenproject.org, devicetree@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net,
linux-pm@vger.kernel.org,
adi-buildroot-devel@lists.sourceforge.net,
linux-m68k@lists.linux-m68k.org, linux-am33-list@redhat.com,
linux-tegra@vger.kernel.org,
openipmi-developer@lists.sourceforge.net,
linux-metag@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Samuel Ortiz <sameo@linux.intel.com>,
linux-parisc@vger.kernel.org, linux-cris-kernel@axis.com,
linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 18/44] mfd: twl4030-power: Register with kernel poweroff handler
Date: Tue, 7 Oct 2014 08:52:38 +0100 [thread overview]
Message-ID: <20141007075238.GA25331@lee--X1> (raw)
In-Reply-To: <1412659726-29957-19-git-send-email-linux@roeck-us.net>
On Mon, 06 Oct 2014, Guenter Roeck wrote:
> Register with kernel poweroff handler instead of setting pm_power_off
> directly. Register with a low priority value of 64 to reflect that
> the original code only sets pm_power_off if it was not already set.
>
> Make twl4030_power_off static as it is only called from the twl4030-power
> driver.
>
> Cc: Samuel Ortiz <sameo@linux.intel.com>
> Cc: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/mfd/twl4030-power.c | 25 +++++++++++++++++++++----
> include/linux/i2c/twl.h | 1 -
> 2 files changed, 21 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index 4d3ff37..bd6b830 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -25,9 +25,10 @@
> */
>
> #include <linux/module.h>
> -#include <linux/pm.h>
> +#include <linux/notifier.h>
> #include <linux/i2c/twl.h>
> #include <linux/platform_device.h>
> +#include <linux/pm.h>
> #include <linux/of.h>
> #include <linux/of_device.h>
>
> @@ -611,7 +612,8 @@ twl4030_power_configure_resources(const struct twl4030_power_data *pdata)
> * After a successful execution, TWL shuts down the power to the SoC
> * and all peripherals connected to it.
> */
> -void twl4030_power_off(void)
> +static int twl4030_power_off(struct notifier_block *this, unsigned long unused1,
> + void *unused2)
> {
> int err;
>
> @@ -619,8 +621,15 @@ void twl4030_power_off(void)
> TWL4030_PM_MASTER_P1_SW_EVENTS);
> if (err)
> pr_err("TWL4030 Unable to power off\n");
> +
> + return NOTIFY_DONE;
> }
>
> +static struct notifier_block twl4030_poweroff_nb = {
> + .notifier_call = twl4030_power_off,
> + .priority = 64,
64 out of what? How is this calculated? Wouldn't it be better to
define these?
> +};
> +
> static bool twl4030_power_use_poweroff(const struct twl4030_power_data *pdata,
> struct device_node *node)
> {
> @@ -836,7 +845,7 @@ static int twl4030_power_probe(struct platform_device *pdev)
> }
>
> /* Board has to be wired properly to use this feature */
> - if (twl4030_power_use_poweroff(pdata, node) && !pm_power_off) {
> + if (twl4030_power_use_poweroff(pdata, node)) {
> /* Default for SEQ_OFFSYNC is set, lets ensure this */
> err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
> TWL4030_PM_MASTER_CFG_P123_TRANSITION);
> @@ -853,7 +862,13 @@ static int twl4030_power_probe(struct platform_device *pdev)
> }
> }
>
> - pm_power_off = twl4030_power_off;
> + err = register_poweroff_handler(&twl4030_poweroff_nb);
> + if (err) {
> + dev_err(&pdev->dev,
> + "Failed to register poweroff handler\n");
If this is not fatal, you should issue a dev_warn() instead.
> + /* Not a fatal error */
> + err = 0;
How about using your own variable for this? Then you don't have to
worry about resetting it.
> + }
> }
>
> relock:
> @@ -869,6 +884,8 @@ relock:
>
> static int twl4030_power_remove(struct platform_device *pdev)
> {
> + unregister_poweroff_handler(&twl4030_poweroff_nb);
Perhaps a naive question, but is there any way you can do this using
devres (devm_* managed resources)?
> return 0;
> }
>
> diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
> index 8cfb50f..f8544f1 100644
> --- a/include/linux/i2c/twl.h
> +++ b/include/linux/i2c/twl.h
> @@ -680,7 +680,6 @@ struct twl4030_power_data {
> };
>
> extern int twl4030_remove_script(u8 flags);
> -extern void twl4030_power_off(void);
>
> struct twl4030_codec_data {
> unsigned int digimic_delay; /* in ms */
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2014-10-07 7:52 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-07 5:28 [PATCH 00/44] kernel: Add support for poweroff handler call chain Guenter Roeck
2014-10-07 5:28 ` [PATCH 01/44] " Guenter Roeck
2014-10-07 7:46 ` Philippe Rétornaz
2014-10-09 10:31 ` Pavel Machek
2014-10-09 15:38 ` Guenter Roeck
2014-10-09 11:31 ` Geert Uytterhoeven
2014-10-09 13:25 ` Guenter Roeck
2015-06-18 1:04 ` Stephen Boyd
2015-06-18 6:53 ` Frans Klaver
2015-06-18 11:54 ` Guenter Roeck
2015-06-18 12:14 ` Frans Klaver
2015-06-18 15:30 ` Guenter Roeck
2015-06-18 21:40 ` Stephen Boyd
2014-10-07 5:28 ` [PATCH 02/44] memory: emif: Use API function to determine poweroff capability Guenter Roeck
2014-10-07 5:28 ` [PATCH 03/44] hibernate: Call have_kernel_poweroff instead of checking pm_power_off Guenter Roeck
2014-10-07 23:41 ` Rafael J. Wysocki
2014-10-09 10:32 ` Pavel Machek
2014-10-09 13:24 ` Guenter Roeck
2014-10-07 5:28 ` [PATCH 04/44] m68k: Replace mach_power_off with pm_power_off Guenter Roeck
2014-10-07 8:29 ` Geert Uytterhoeven
2014-10-07 5:28 ` [PATCH 05/44] mfd: as3722: Drop reference to pm_power_off from devicetree bindings Guenter Roeck
2014-10-07 10:59 ` Mark Rutland
2014-10-07 16:21 ` Rob Landley
2014-10-07 16:31 ` Guenter Roeck
2014-10-07 16:59 ` David Daney
2014-10-07 17:10 ` Rob Landley
2014-10-07 16:58 ` Mark Rutland
2014-10-07 5:28 ` [PATCH 06/44] gpio-poweroff: " Guenter Roeck
2014-10-07 11:03 ` Mark Rutland
2014-10-07 15:50 ` Andrew Lunn
2014-10-07 5:28 ` [PATCH 07/44] qnap-poweroff: " Guenter Roeck
2014-10-07 11:02 ` Mark Rutland
2014-10-07 15:57 ` Guenter Roeck
2014-10-07 15:51 ` Andrew Lunn
2014-10-07 5:28 ` [PATCH 08/44] kernel: Move pm_power_off to common code Guenter Roeck
2014-10-07 8:32 ` Geert Uytterhoeven
2014-10-07 13:58 ` Richard Weinberger
2014-10-07 23:42 ` Rafael J. Wysocki
2014-10-08 7:25 ` Jesper Nilsson
2014-10-08 11:06 ` 回复: " Xuetao Guan
2014-10-09 10:28 ` Catalin Marinas
2014-10-09 10:35 ` Vineet Gupta
2014-10-09 10:38 ` Pavel Machek
2014-10-09 13:14 ` Guenter Roeck
2014-10-09 20:24 ` Pavel Machek
2014-10-10 16:53 ` Guenter Roeck
2014-10-14 4:29 ` Hirokazu TAKATA
2014-10-07 5:28 ` [PATCH 09/44] mfd: palmas: Register with kernel poweroff handler Guenter Roeck
2014-10-07 5:28 ` [PATCH 10/44] mfd: axp20x: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 11/44] mfd: retu: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 12/44] mfd: ab8500-sysctrl: " Guenter Roeck
2014-10-07 8:00 ` Lee Jones
2014-10-09 10:36 ` Catalin Marinas
2014-10-09 10:49 ` Lee Jones
2014-10-09 13:26 ` Guenter Roeck
2014-10-09 13:33 ` Lee Jones
2014-10-09 15:45 ` Guenter Roeck
2014-10-09 15:54 ` Guenter Roeck
2014-10-07 5:28 ` [PATCH 13/44] mfd: max8907: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 14/44] mfd: tps80031: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 15/44] mfd: dm355evm_msp: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 16/44] mfd: tps6586x: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 17/44] mfd: tps65910: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 18/44] mfd: twl4030-power: " Guenter Roeck
2014-10-07 7:52 ` Lee Jones [this message]
2014-10-07 5:28 ` [PATCH 19/44] ipmi: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 20/44] power/reset: restart-poweroff: " Guenter Roeck
2014-10-07 16:06 ` Andrew Lunn
2014-10-07 5:28 ` [PATCH 21/44] power/reset: gpio-poweroff: " Guenter Roeck
2014-10-07 16:00 ` Andrew Lunn
2014-10-07 5:28 ` [PATCH 22/44] power/reset: as3722-poweroff: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 23/44] power/reset: qnap-poweroff: " Guenter Roeck
2014-10-07 16:02 ` Andrew Lunn
2014-10-07 5:28 ` [PATCH 24/44] power/reset: msm-powroff: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 25/44] power/reset: vexpress-poweroff: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 26/44] x86: iris: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 27/44] x86: apm: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 28/44] x86: olpc: Register xo1 poweroff handler " Guenter Roeck
2014-10-07 5:28 ` [PATCH 29/44] staging: nvec: Register " Guenter Roeck
2014-10-07 16:23 ` Greg Kroah-Hartman
2014-10-07 5:28 ` [PATCH 30/44] acpi: Register poweroff handler " Guenter Roeck
2014-10-07 5:28 ` [PATCH 31/44] arm: Register " Guenter Roeck
2014-10-07 8:04 ` Nicolas Ferre
2014-10-07 5:28 ` [PATCH 32/44] arm64: psci: " Guenter Roeck
2014-10-09 10:41 ` Catalin Marinas
2014-10-07 5:28 ` [PATCH 33/44] avr32: atngw100: " Guenter Roeck
2014-11-01 10:16 ` Hans-Christian Egtvedt
2014-11-01 17:02 ` Guenter Roeck
2014-10-07 5:28 ` [PATCH 34/44] ia64: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 35/44] m68k: " Guenter Roeck
2014-10-07 9:19 ` Geert Uytterhoeven
2014-10-07 5:28 ` [PATCH 36/44] mips: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 37/44] sh: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 38/44] x86: lguest: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 39/44] x86: ce4100: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 40/44] x86: intel-mid: Drop registration of dummy poweroff handlers Guenter Roeck
2014-10-07 5:28 ` [PATCH 41/44] x86: pmc_atom: Register poweroff handler with kernel poweroff handler Guenter Roeck
2014-10-07 5:28 ` [PATCH 42/44] efi: " Guenter Roeck
2014-10-07 5:28 ` [PATCH 43/44] hwmon: (ab8500) Call kernel_power_off instead of pm_power_off Guenter Roeck
2014-10-07 5:28 ` [PATCH 44/44] kernel: Remove pm_power_off Guenter Roeck
2014-10-07 23:43 ` Rafael J. Wysocki
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=20141007075238.GA25331@lee--X1 \
--to=lee.jones@linaro.org \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=lguest@lists.ozlabs.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-am33-list@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-cris-kernel@axis.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m32r-ja@ml.linux-m32r.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-metag@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@roeck-us.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=openipmi-developer@lists.sourceforge.net \
--cc=sameo@linux.intel.com \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=xen-devel@lists.xenproject.org \
/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;
as well as URLs for NNTP newsgroup(s).