From: Eduardo Valentin <edubezval@gmail.com>
To: Rui Zhang <rui.zhang@intel.com>
Cc: Linux PM <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>, Keerthy <a0393675@ti.com>,
Eduardo Valentin <edubezval@gmail.com>
Subject: [PATCHv4 48/48] thermal: sysfs: use kcalloc() instead of kzalloc()
Date: Mon, 30 May 2016 23:18:55 -0700 [thread overview]
Message-ID: <1464675535-2433-49-git-send-email-edubezval@gmail.com> (raw)
In-Reply-To: <1464675535-2433-1-git-send-email-edubezval@gmail.com>
Simplify size computation by using kcalloc() for
allocating memory for arrays.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
---
drivers/thermal/thermal_sysfs.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index ca4b83a..4136b71 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -505,22 +505,25 @@ static const struct attribute_group *thermal_zone_attribute_groups[] = {
*/
static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
{
- int size = sizeof(struct thermal_attr) * tz->trips;
struct attribute **attrs;
int indx;
- tz->trip_type_attrs = kzalloc(size, GFP_KERNEL);
+ tz->trip_type_attrs = kcalloc(tz->trips, sizeof(*tz->trip_type_attrs),
+ GFP_KERNEL);
if (!tz->trip_type_attrs)
return -ENOMEM;
- tz->trip_temp_attrs = kzalloc(size, GFP_KERNEL);
+ tz->trip_temp_attrs = kcalloc(tz->trips, sizeof(*tz->trip_temp_attrs),
+ GFP_KERNEL);
if (!tz->trip_temp_attrs) {
kfree(tz->trip_type_attrs);
return -ENOMEM;
}
if (tz->ops->get_trip_hyst) {
- tz->trip_hyst_attrs = kzalloc(size, GFP_KERNEL);
+ tz->trip_hyst_attrs = kcalloc(tz->trips,
+ sizeof(*tz->trip_hyst_attrs),
+ GFP_KERNEL);
if (!tz->trip_hyst_attrs) {
kfree(tz->trip_type_attrs);
kfree(tz->trip_temp_attrs);
@@ -528,7 +531,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
}
}
- attrs = kzalloc(sizeof(*attrs) * tz->trips * 3 + 1, GFP_KERNEL);
+ attrs = kcalloc(tz->trips * 3 + 1, sizeof(*attrs), GFP_KERNEL);
if (!attrs) {
kfree(tz->trip_type_attrs);
kfree(tz->trip_temp_attrs);
--
2.1.4
next prev parent reply other threads:[~2016-05-31 6:21 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 6:18 [PATCHv4 00/48] thermal: reorganizing thermal core Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 01/48] thermal: core: prevent zones with no types to be registered Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 02/48] thermal: core: group thermal_zone DEVICE_ATTR's declarations Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 03/48] thermal: core: group device_create_file() calls that are always created Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 04/48] thermal: core: use dev.groups to manage always present tz attributes Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 05/48] thermal: core: move emul_temp creation to tz->device.groups Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 06/48] thermal: core: move mode attribute " Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 07/48] thermal: core: move passive attr " Eduardo Valentin
2016-06-16 3:27 ` Zhang Rui
2016-06-16 4:15 ` Zhang Rui
2016-05-31 6:18 ` [PATCHv4 08/48] thermal: core: improve power actor documentation Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 09/48] thermal: core: move power actor code out of sysfs I/F section Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 10/48] thermal: core: remove useless empty line Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 11/48] thermal: core: fix style on remove_trip_attrs() Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 12/48] thermal: core: move the trip attrs to the tz sysfs I/F section Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 13/48] thermal: core: create tz->device.groups dynamically Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 14/48] thermal: core: move trips attributes to tz->device.groups Eduardo Valentin
2016-06-17 8:44 ` Zhang Rui
2016-05-31 6:18 ` [PATCHv4 15/48] thermal: core: remove unnecessary device_remove() calls Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 16/48] thermal: core: split passive_store Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 17/48] thermal: core: split policy_store Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 18/48] thermal: core: split available_policies_show() Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 19/48] thermal: core: move to_thermal_zone() macro to header file Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 20/48] thermal: core: treat correctly the return value of *scanf calls Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 21/48] thermal: core: match parenthesis on code alignment Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 22/48] thermal: core: move thermal_zone sysfs to thermal_sysfs.c Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 23/48] thermal: core: move to_cooling_device macro to header file Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 24/48] thermal: core: move cooling device sysfs to thermal_sysfs.c Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 25/48] thermal: core: remove a couple of style issues on helpers Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 26/48] thermal: core: introduce thermal_helpers.c Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 27/48] thermal: core: group functions related to governor handling Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 28/48] thermal: core: move idr handling to device management section Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 29/48] thermal: core: small style fix on __unbind() helper Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 30/48] thermal: core: move __unbind() helper to where it is used Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 31/48] thermal: core: move bind_cdev() " Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 32/48] thermal: core: move bind_tz() " Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 33/48] thermal: core: fix couple of style issues on __bind() helper Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 34/48] thermal: core: move __bind() to where it is used Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 35/48] thermal: core: add inline to print_bind_err_msg() Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 36/48] thermal: core: move notify to the zone update section Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 37/48] thermal: core: add a comment describing the main update loop Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 38/48] thermal: core: add a comment describing the power actor section Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 39/48] thermal: core: add a comment describing the device management section Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 40/48] thermal: sysfs: remove symbols of emul_temp when config is disabled Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 41/48] thermal: core: remove FSF address in the GPL notice Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 42/48] thermal: core: small style fix when checking for __find_governor() Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 43/48] thermal: core: standardize line breaking alignment Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 44/48] thermal: core: remove void function return statements Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 45/48] thermal: core: remove style warnings and checks Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 46/48] thermal: core: improve kerneldoc entry of thermal_cooling_device_unregister Eduardo Valentin
2016-05-31 6:18 ` [PATCHv4 47/48] thermal: core: use kzalloc(sizeof(*ptr),...) Eduardo Valentin
2016-05-31 6:18 ` Eduardo Valentin [this message]
2016-05-31 9:42 ` [PATCHv4 00/48] thermal: reorganizing thermal core Keerthy
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=1464675535-2433-49-git-send-email-edubezval@gmail.com \
--to=edubezval@gmail.com \
--cc=a0393675@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
/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).