LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: MyungJoo Ham <myungjoo.ham@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] PM / devfreq: Use put_device() on device_register error
Date: Tue, 24 Apr 2018 15:35:20 -0700 [thread overview]
Message-ID: <20180424223521.28193-6-bjorn.andersson@linaro.org> (raw)
In-Reply-To: <20180424223521.28193-1-bjorn.andersson@linaro.org>
After calling device_register() the dev must be released using
put_device() rather than just freeing the carrying object.
The release function of the devfreq device will be called in this case,
but as we're yet to add the devfreq instance to the devfreq_list the
release function would print a warning and return.
But as the error path of devfreq_add_device() has been cleaned up the
release function is now the only function taking the devfreq off the
list, so we do not need to safe guard against the devfreq not being on
the list.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/devfreq/devfreq.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 70588dc2032c..c804bd72a644 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -523,11 +523,6 @@ static void devfreq_dev_release(struct device *dev)
struct devfreq *devfreq = to_devfreq(dev);
mutex_lock(&devfreq_list_lock);
- if (IS_ERR(find_device_devfreq(devfreq->dev.parent))) {
- mutex_unlock(&devfreq_list_lock);
- dev_warn(&devfreq->dev, "releasing devfreq which doesn't exist\n");
- return;
- }
list_del(&devfreq->node);
mutex_unlock(&devfreq_list_lock);
@@ -583,6 +578,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
goto err_out;
}
+ INIT_LIST_HEAD(&devfreq->node);
mutex_init(&devfreq->lock);
devfreq->dev.parent = dev;
devfreq->dev.class = devfreq_class;
@@ -630,7 +626,8 @@ struct devfreq *devfreq_add_device(struct device *dev,
atomic_inc_return(&devfreq_no));
err = device_register(&devfreq->dev);
if (err) {
- goto err_dev;
+ put_device(&devfreq->dev);
+ goto err_out;
}
mutex_lock(&devfreq_list_lock);
--
2.16.2
next prev parent reply other threads:[~2018-04-24 22:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-24 22:35 [PATCH 0/6] Misc devfreq_add_device() fixes Bjorn Andersson
2018-04-24 22:35 ` [PATCH 1/6] PM / devfreq: Free devfreq upon set_freq_table error Bjorn Andersson
2018-04-24 22:35 ` [PATCH 2/6] PM / devfreq: Use the device release function for cleanup Bjorn Andersson
2018-04-24 22:35 ` [PATCH 3/6] PM / devfreq: Reorder devfreq_add_device() Bjorn Andersson
2018-04-24 22:35 ` [PATCH 4/6] PM / devfreq: Remove unnecessary locking Bjorn Andersson
2018-04-24 22:35 ` Bjorn Andersson [this message]
2018-04-24 22:35 ` [PATCH 6/6] PM / devfreq: Reject client provided freq_table Bjorn Andersson
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=20180424223521.28193-6-bjorn.andersson@linaro.org \
--to=bjorn.andersson@linaro.org \
--cc=cw00.choi@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--subject='Re: [PATCH 5/6] PM / devfreq: Use put_device() on device_register error' \
/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
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).