From: zhongjiang@huawei.com (zhong jiang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm: pm: call put_device instead of of_node_put in at91_pm_config_ws
Date: Thu, 23 Aug 2018 21:22:35 +0800 [thread overview]
Message-ID: <5B7EB51B.9080901@huawei.com> (raw)
In-Reply-To: <20180823121921.GE21707@piout.net>
On 2018/8/23 20:19, Alexandre Belloni wrote:
> On 23/08/2018 19:44:38+0800, zhong jiang wrote:
>> Hi, alexandre
>>
>> Can you pick up the patch? Thanks
>>
> We are still in the merge window, this has to wait for v4.19-rc1.
Fine. Thank you for let me know .
>> Best wishes,
>> zhong jiang
>>
>> On 2018/8/16 18:26, zhong jiang wrote:
>>> of_find_device_by_node takes a reference to the struct device when it
>>> finds a match via get_device. but it fails to put_device in
>>> at91_pm_config_ws, for_each_matching_node_and_match will get and put
>>> the node properly, there is no need to call the of_put_node. Therefore,
>>> just call put_device instead of of_node_put in at91_pm_config_ws.
>>>
>>> Fixes: d7484f5c6b3b ("ARM: at91: pm: configure wakeup sources for ULP1 mode")
>>> Suggested-by: Claudiu Beznea <Claudiu.Beznea@microchip.com>
>>> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
>>> ---
>>> arch/arm/mach-at91/pm.c | 6 +++---
>>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
>>> index 32fae4d..6574f00 100644
>>> --- a/arch/arm/mach-at91/pm.c
>>> +++ b/arch/arm/mach-at91/pm.c
>>> @@ -143,15 +143,15 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set)
>>>
>>> /* Check if enabled on SHDWC. */
>>> if (wsi->shdwc_mr_bit && !(val & wsi->shdwc_mr_bit))
>>> - goto put_node;
>>> + goto put_device;
>>>
>>> mode |= wsi->pmc_fsmr_bit;
>>> if (wsi->set_polarity)
>>> polarity |= wsi->pmc_fsmr_bit;
>>> }
>>>
>>> -put_node:
>>> - of_node_put(np);
>>> +put_device:
>>> + put_device(&pdev->dev);
>>> }
>>>
>>> if (mode) {
>>
WARNING: multiple messages have this Message-ID (diff)
From: zhong jiang <zhongjiang@huawei.com>
To: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: <Claudiu.Beznea@microchip.com>, <linux@armlinux.org.uk>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] arm: pm: call put_device instead of of_node_put in at91_pm_config_ws
Date: Thu, 23 Aug 2018 21:22:35 +0800 [thread overview]
Message-ID: <5B7EB51B.9080901@huawei.com> (raw)
In-Reply-To: <20180823121921.GE21707@piout.net>
On 2018/8/23 20:19, Alexandre Belloni wrote:
> On 23/08/2018 19:44:38+0800, zhong jiang wrote:
>> Hi, alexandre
>>
>> Can you pick up the patch? Thanks
>>
> We are still in the merge window, this has to wait for v4.19-rc1.
Fine. Thank you for let me know .
>> Best wishes,
>> zhong jiang
>>
>> On 2018/8/16 18:26, zhong jiang wrote:
>>> of_find_device_by_node takes a reference to the struct device when it
>>> finds a match via get_device. but it fails to put_device in
>>> at91_pm_config_ws, for_each_matching_node_and_match will get and put
>>> the node properly, there is no need to call the of_put_node. Therefore,
>>> just call put_device instead of of_node_put in at91_pm_config_ws.
>>>
>>> Fixes: d7484f5c6b3b ("ARM: at91: pm: configure wakeup sources for ULP1 mode")
>>> Suggested-by: Claudiu Beznea <Claudiu.Beznea@microchip.com>
>>> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
>>> ---
>>> arch/arm/mach-at91/pm.c | 6 +++---
>>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
>>> index 32fae4d..6574f00 100644
>>> --- a/arch/arm/mach-at91/pm.c
>>> +++ b/arch/arm/mach-at91/pm.c
>>> @@ -143,15 +143,15 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set)
>>>
>>> /* Check if enabled on SHDWC. */
>>> if (wsi->shdwc_mr_bit && !(val & wsi->shdwc_mr_bit))
>>> - goto put_node;
>>> + goto put_device;
>>>
>>> mode |= wsi->pmc_fsmr_bit;
>>> if (wsi->set_polarity)
>>> polarity |= wsi->pmc_fsmr_bit;
>>> }
>>>
>>> -put_node:
>>> - of_node_put(np);
>>> +put_device:
>>> + put_device(&pdev->dev);
>>> }
>>>
>>> if (mode) {
>>
next prev parent reply other threads:[~2018-08-23 13:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 10:26 [PATCH] arm: pm: call put_device instead of of_node_put in at91_pm_config_ws zhong jiang
2018-08-16 10:26 ` zhong jiang
2018-08-23 11:44 ` zhong jiang
2018-08-23 11:44 ` zhong jiang
2018-08-23 12:19 ` Alexandre Belloni
2018-08-23 12:19 ` Alexandre Belloni
2018-08-23 13:22 ` zhong jiang [this message]
2018-08-23 13:22 ` zhong jiang
2018-08-27 15:11 ` Alexandre Belloni
2018-08-27 15:11 ` Alexandre Belloni
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=5B7EB51B.9080901@huawei.com \
--to=zhongjiang@huawei.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.