From nobody Tue Feb 10 01:20:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635370106; cv=none; d=zohomail.com; s=zohoarc; b=Bu8PWGGh2rkq7PBcrF07pBarWxbbR82jWvn5q9ZTKPQvNG4Q99ZRkuPnWmre6tFfN4+RJV+JekmF4zVwrSHca5KlhRxcDLaXJVmVwxTIuneMajHQDb9Ri61gM/Lpb3Blb9zLrDBpLWFdAmq8wN3xRKYLxRC6A65AORsqU6PNtEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635370106; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XVkgO3q8+3iXvnI8C7YHW1hpsebxqvqNvVwPho8vSws=; b=IgHBFs5wJsR1PPcVMgWw+xK30sAVdv1hTXu76WT+gGaR8HC/eDgmOXLki8Cw6woARxVizHpgH89BYEg3ZHlCmESnVabTzMeJqDwUgabu8IiIOLFw4yD5Zyw9aPz44nlbr0TEcr4imwbdp+xA5nzDDXIyy9T/3S2XgGAmV/pwzpM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1635370106548118.8101388517581; Wed, 27 Oct 2021 14:28:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.217291.377349 (Exim 4.92) (envelope-from ) id 1mfqSp-0003Pb-6T; Wed, 27 Oct 2021 21:28:03 +0000 Received: by outflank-mailman (output) from mailman id 217291.377349; Wed, 27 Oct 2021 21:28:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfqSp-0003PH-2K; Wed, 27 Oct 2021 21:28:03 +0000 Received: by outflank-mailman (input) for mailman id 217291; Wed, 27 Oct 2021 21:28:02 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfqLg-0000sJ-Cm for xen-devel@lists.xenproject.org; Wed, 27 Oct 2021 21:20:40 +0000 Received: from mail-lj1-x22c.google.com (unknown [2a00:1450:4864:20::22c]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2a30c3a8-3914-4552-9591-340833ae07dc; Wed, 27 Oct 2021 21:18:45 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id k13so6922068ljj.12 for ; Wed, 27 Oct 2021 14:18:45 -0700 (PDT) Received: from localhost.localdomain (46-138-41-28.dynamic.spd-mgts.ru. [46.138.41.28]) by smtp.gmail.com with ESMTPSA id d7sm104336ljl.18.2021.10.27.14.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 14:18:44 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2a30c3a8-3914-4552-9591-340833ae07dc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XVkgO3q8+3iXvnI8C7YHW1hpsebxqvqNvVwPho8vSws=; b=JvBjth71MhsyIm0JdpPylPRsS4KUFW6BneSIAqxDXDzbFjW9Bt93MWfm5UnDUVT+LY PN2DoVOg4LkGHqR46okUaH0xtknlZuN7sz1m2rXWFP+8ycrv0mDE2+lXOLhNQyopT3Vb C9HJqmEvn5NNTeFE+Yqt8PhYhqF5nNL7X6uD9nn3NzyyFpNh4ofur6IOki9Q5zCOptdK PNXfyjJD/8x2BE3QO9lZ5RaDpWCetJjHnzeJvzuWrsMKLwqp5dFqdwNw5X1p5tIb9H77 X9gwILOKempj602Hj9wd8g1ui3+PA2eteBB91Roi8uzQIKwV7mQ4s5O8fFD8fUrtUyG6 Kjfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XVkgO3q8+3iXvnI8C7YHW1hpsebxqvqNvVwPho8vSws=; b=Cv6uTIRUoRiNxUDYded0HSpKvlZPwGeb2gPoFy0B36ap8b767QFpNMBV3eQwfBlSQu YbuJgQ5blV6EV/LFQB4WxtL4goTzHhJN5L3zeKyCh/gZOnbWW3/03T24r4b2O3YuAl3d lu4C+bCFb0/+merDn1ZnM0tMC0lZO20loeqvgHd22ZLe86HlyaEkBVLx01yZvjIScBwG smxWdTRQjkalmg7AGdlb6w1SYvEwlVUlZJCIHpwf0urSSQ5K+IjgJSSnEjJhPKY3xh1A 1fXA7GDMzn2lCQ6SOpgzt5P5L7h0un+MUx0J6TZTgNzBt9PLu86Ubxi/NKQUeyk5htiC OLzw== X-Gm-Message-State: AOAM533V+wAfoJO5TwDZNOi1ZykbfglfosZqd2HY5ujTzdI+krnVL4+8 0OuMOVx4vbuZT7+WtpfjWVo= X-Google-Smtp-Source: ABdhPJyyXdjb3N9Ed9Jr705ZzPzIsFRHZUJ+KOYE2dHtjD39JQsr/OWSSeXdN0P7Zob21uOYhbWDdA== X-Received: by 2002:a2e:9b55:: with SMTP id o21mr306486ljj.141.1635369524980; Wed, 27 Oct 2021 14:18:44 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Lee Jones , "Rafael J . Wysocki" , Mark Brown , Andrew Morton , Guenter Roeck , Russell King , Daniel Lezcano , Andy Shevchenko , Ulf Hansson Cc: Catalin Marinas , Will Deacon , Guo Ren , Geert Uytterhoeven , Greg Ungerer , Joshua Thompson , Thomas Bogendoerfer , Nick Hu , Greentime Hu , Vincent Chen , "James E.J. Bottomley" , Helge Deller , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Paul Walmsley , Palmer Dabbelt , Albert Ou , Yoshinori Sato , Rich Felker , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Boris Ostrovsky , Juergen Gross , Stefano Stabellini , Len Brown , Santosh Shilimkar , Krzysztof Kozlowski , Linus Walleij , Chen-Yu Tsai , =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= , Tony Lindgren , Liam Girdwood , Philipp Zabel , Vladimir Zapolskiy , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Pavel Machek , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org, linux-omap@vger.kernel.org, openbmc@lists.ozlabs.org, linux-tegra@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v2 28/45] mfd: rn5t618: Use devm_register_power_handler() Date: Thu, 28 Oct 2021 00:16:58 +0300 Message-Id: <20211027211715.12671-29-digetx@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027211715.12671-1-digetx@gmail.com> References: <20211027211715.12671-1-digetx@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635370106976100001 Content-Type: text/plain; charset="utf-8" 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 --- drivers/mfd/rn5t618.c | 56 ++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c index 384acb459427..12d7b2339bbe 100644 --- a/drivers/mfd/rn5t618.c +++ b/drivers/mfd/rn5t618.c @@ -84,9 +84,6 @@ static const struct regmap_irq_chip rc5t619_irq_chip =3D { .mask_invert =3D true, }; =20 -static struct i2c_client *rn5t618_pm_power_off; -static struct notifier_block rn5t618_restart_handler; - static int rn5t618_irq_init(struct rn5t618 *rn5t618) { const struct regmap_irq_chip *irq_chip =3D NULL; @@ -115,7 +112,9 @@ static int rn5t618_irq_init(struct rn5t618 *rn5t618) return ret; } =20 -static void rn5t618_trigger_poweroff_sequence(bool repower) +static void +rn5t618_trigger_poweroff_sequence(struct i2c_client *rn5t618_pm_power_off, + bool repower) { int ret; =20 @@ -151,25 +150,31 @@ static void rn5t618_trigger_poweroff_sequence(bool re= power) dev_alert(&rn5t618_pm_power_off->dev, "Failed to shutdown (err =3D %d)\n"= , ret); } =20 -static void rn5t618_power_off(void) +static void rn5t618_power_off(struct power_off_data *data) { - rn5t618_trigger_poweroff_sequence(false); + struct i2c_client *client =3D data->cb_data; + + rn5t618_trigger_poweroff_sequence(client, false); } =20 -static int rn5t618_restart(struct notifier_block *this, - unsigned long mode, void *cmd) +static void rn5t618_restart(struct restart_data *data) { - rn5t618_trigger_poweroff_sequence(true); + struct i2c_client *client =3D data->cb_data; + + rn5t618_trigger_poweroff_sequence(client, true); =20 /* * Re-power factor detection on PMIC side is not instant. 1ms * proved to be enough time until reset takes effect. */ mdelay(1); - - return NOTIFY_DONE; } =20 +static struct power_handler rn5t618_power_handler =3D { + .restart_cb =3D rn5t618_restart, + .restart_priority =3D RESTART_PRIO_HIGH, +}; + static const struct of_device_id rn5t618_of_match[] =3D { { .compatible =3D "ricoh,rn5t567", .data =3D (void *)RN5T567 }, { .compatible =3D "ricoh,rn5t618", .data =3D (void *)RN5T618 }, @@ -221,38 +226,20 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c) return ret; } =20 - rn5t618_pm_power_off =3D i2c; - if (of_device_is_system_power_controller(i2c->dev.of_node)) { - if (!pm_power_off) - pm_power_off =3D rn5t618_power_off; - else - dev_warn(&i2c->dev, "Poweroff callback already assigned\n"); - } + if (of_device_is_system_power_controller(i2c->dev.of_node)) + rn5t618_power_handler.power_off_cb =3D rn5t618_power_off; =20 - rn5t618_restart_handler.notifier_call =3D rn5t618_restart; - rn5t618_restart_handler.priority =3D 192; + rn5t618_power_handler.cb_data =3D i2c; =20 - ret =3D register_restart_handler(&rn5t618_restart_handler); + ret =3D devm_register_power_handler(&i2c->dev, &rn5t618_power_handler); if (ret) { - dev_err(&i2c->dev, "cannot register restart handler, %d\n", ret); + dev_err(&i2c->dev, "failed to register power handler: %d\n", ret); return ret; } =20 return rn5t618_irq_init(priv); } =20 -static int rn5t618_i2c_remove(struct i2c_client *i2c) -{ - if (i2c =3D=3D rn5t618_pm_power_off) { - rn5t618_pm_power_off =3D NULL; - pm_power_off =3D NULL; - } - - unregister_restart_handler(&rn5t618_restart_handler); - - return 0; -} - static int __maybe_unused rn5t618_i2c_suspend(struct device *dev) { struct rn5t618 *priv =3D dev_get_drvdata(dev); @@ -284,7 +271,6 @@ static struct i2c_driver rn5t618_i2c_driver =3D { .pm =3D &rn5t618_i2c_dev_pm_ops, }, .probe_new =3D rn5t618_i2c_probe, - .remove =3D rn5t618_i2c_remove, }; =20 module_i2c_driver(rn5t618_i2c_driver); --=20 2.33.1