| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20211027211715.12671-31-digetx@gmail.com>
Date: Thu, 28 Oct 2021 00:17:00 +0300
From: Dmitry Osipenko <digetx@...il.com>
To: Thierry Reding <thierry.reding@...il.com>,
Jonathan Hunter <jonathanh@...dia.com>,
Lee Jones <lee.jones@...aro.org>,
"Rafael J . Wysocki" <rafael@...nel.org>,
Mark Brown <broonie@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Guenter Roeck <linux@...ck-us.net>,
Russell King <linux@...linux.org.uk>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Ulf Hansson <ulf.hansson@...aro.org>
Cc: Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will@...nel.org>, Guo Ren <guoren@...nel.org>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Greg Ungerer <gerg@...ux-m68k.org>,
Joshua Thompson <funaho@...ai.org>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Nick Hu <nickhu@...estech.com>,
Greentime Hu <green.hu@...il.com>,
Vincent Chen <deanbo422@...il.com>,
"James E.J. Bottomley" <James.Bottomley@...senPartnership.com>,
Helge Deller <deller@....de>,
Michael Ellerman <mpe@...erman.id.au>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
Paul Walmsley <paul.walmsley@...ive.com>,
Palmer Dabbelt <palmer@...belt.com>,
Albert Ou <aou@...s.berkeley.edu>,
Yoshinori Sato <ysato@...rs.sourceforge.jp>,
Rich Felker <dalias@...c.org>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
Dave Hansen <dave.hansen@...ux.intel.com>, x86@...nel.org,
"H. Peter Anvin" <hpa@...or.com>,
Boris Ostrovsky <boris.ostrovsky@...cle.com>,
Juergen Gross <jgross@...e.com>,
Stefano Stabellini <sstabellini@...nel.org>,
Len Brown <lenb@...nel.org>,
Santosh Shilimkar <ssantosh@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>,
Linus Walleij <linus.walleij@...aro.org>,
Chen-Yu Tsai <wens@...e.org>,
Jonathan Neuschäfer <j.neuschaefer@....net>,
Tony Lindgren <tony@...mide.com>,
Liam Girdwood <lgirdwood@...il.com>,
Philipp Zabel <p.zabel@...gutronix.de>,
Vladimir Zapolskiy <vz@...ia.com>,
Avi Fishman <avifishman70@...il.com>,
Tomer Maimon <tmaimon77@...il.com>,
Tali Perry <tali.perry1@...il.com>,
Patrick Venture <venture@...gle.com>,
Nancy Yuen <yuenn@...gle.com>,
Benjamin Fair <benjaminfair@...gle.com>,
Pavel Machek <pavel@....cz>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-csky@...r.kernel.org, linux-ia64@...r.kernel.org,
linux-m68k@...ts.linux-m68k.org, linux-mips@...r.kernel.org,
linux-parisc@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
linux-riscv@...ts.infradead.org, linux-sh@...r.kernel.org,
xen-devel@...ts.xenproject.org, linux-acpi@...r.kernel.org,
linux-omap@...r.kernel.org, openbmc@...ts.ozlabs.org,
linux-tegra@...r.kernel.org, linux-pm@...r.kernel.org
Subject: [PATCH v2 30/45] mfd: ene-kb3930: Use devm_register_power_handler()
Use devm_register_power_handler() that replaces global pm_power_off
variable and allows to register multiple power-off handlers. It also
provides restart-handler support, i.e. all in one API.
Signed-off-by: Dmitry Osipenko <digetx@...il.com>
---
drivers/mfd/ene-kb3930.c | 45 ++++++++++++++--------------------------
1 file changed, 15 insertions(+), 30 deletions(-)
diff --git a/drivers/mfd/ene-kb3930.c b/drivers/mfd/ene-kb3930.c
index 1b73318d1f1f..6a3c5f48e5e1 100644
--- a/drivers/mfd/ene-kb3930.c
+++ b/drivers/mfd/ene-kb3930.c
@@ -31,10 +31,9 @@ struct kb3930 {
struct i2c_client *client;
struct regmap *ram_regmap;
struct gpio_descs *off_gpios;
+ struct power_handler power_handler;
};
-static struct kb3930 *kb3930_power_off;
-
#define EC_GPIO_WAVE 0
#define EC_GPIO_OFF_MODE 1
@@ -60,21 +59,19 @@ static void kb3930_off(struct kb3930 *ddata, int off_mode)
}
}
-static int kb3930_restart(struct notifier_block *this,
- unsigned long mode, void *cmd)
+static void kb3930_restart(struct restart_data *data)
{
- kb3930_off(kb3930_power_off, EC_OFF_MODE_REBOOT);
- return NOTIFY_DONE;
+ struct kb3930 *ddata = data->cb_data;
+
+ kb3930_off(ddata, EC_OFF_MODE_REBOOT);
}
-static void kb3930_pm_power_off(void)
+static void kb3930_power_off(struct power_off_data *data)
{
- kb3930_off(kb3930_power_off, EC_OFF_MODE_POWER);
-}
+ struct kb3930 *ddata = data->cb_data;
-static struct notifier_block kb3930_restart_nb = {
- .notifier_call = kb3930_restart,
-};
+ kb3930_off(ddata, EC_OFF_MODE_POWER);
+}
static const struct mfd_cell ariel_ec_cells[] = {
{ .name = "dell-wyse-ariel-led", },
@@ -131,7 +128,6 @@ static int kb3930_probe(struct i2c_client *client)
if (!ddata)
return -ENOMEM;
- kb3930_power_off = ddata;
ddata->client = client;
i2c_set_clientdata(client, ddata);
@@ -169,24 +165,14 @@ static int kb3930_probe(struct i2c_client *client)
}
if (ddata->off_gpios) {
- register_restart_handler(&kb3930_restart_nb);
- if (!pm_power_off)
- pm_power_off = kb3930_pm_power_off;
- }
+ ddata->power_handler.cb_data = ddata;
+ ddata->power_handler.restart_cb = kb3930_restart;
+ ddata->power_handler.power_off_cb = kb3930_power_off;
- return 0;
-}
-
-static int kb3930_remove(struct i2c_client *client)
-{
- struct kb3930 *ddata = i2c_get_clientdata(client);
-
- if (ddata->off_gpios) {
- if (pm_power_off == kb3930_pm_power_off)
- pm_power_off = NULL;
- unregister_restart_handler(&kb3930_restart_nb);
+ ret = devm_register_power_handler(dev, &ddata->power_handler);
+ if (ret)
+ return ret;
}
- kb3930_power_off = NULL;
return 0;
}
@@ -199,7 +185,6 @@ MODULE_DEVICE_TABLE(of, kb3930_dt_ids);
static struct i2c_driver kb3930_driver = {
.probe_new = kb3930_probe,
- .remove = kb3930_remove,
.driver = {
.name = "ene-kb3930",
.of_match_table = kb3930_dt_ids,
--
2.33.1
Powered by blists - more mailing lists