| Message ID | 20240105074618.1667898-10-suma.hegde@amd.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Add ACPI probing support for HSMP | expand |
On Fri, 5 Jan 2024, Suma Hegde wrote: > Use the standard array allocation variant of devm memory allocation > APIs. > > Also remove extra parenthesis around hsmp_get_tbl_dram_base() > and add a space in a comment. > > Signed-off-by: Suma Hegde <suma.hegde@amd.com> > Reviewed-by: Naveen Krishna Chatradhi <nchatrad@amd.com> > --- > Changes since v3: > New patch, based on Ilpos review comments and additional cosmetic changes. > > drivers/platform/x86/amd/hsmp.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c > index 99bebb0ca5a9..f2247885c547 100644 > --- a/drivers/platform/x86/amd/hsmp.c > +++ b/drivers/platform/x86/amd/hsmp.c > @@ -643,12 +643,12 @@ static int hsmp_init_metric_tbl_bin_attr(struct bin_attribute **hattrs, u16 sock > hattrs[0] = hattr; > > if (plat_dev.proto_ver == HSMP_PROTO_VER6) > - return (hsmp_get_tbl_dram_base(sock_ind)); > + return hsmp_get_tbl_dram_base(sock_ind); > else > return 0; > } > > -/* One bin sysfs for metrics table*/ > +/* One bin sysfs for metrics table */ > #define NUM_HSMP_ATTRS 1 > > static int hsmp_create_attr_list(struct attribute_group *attr_grp, Please put these two into own change. > @@ -657,8 +657,9 @@ static int hsmp_create_attr_list(struct attribute_group *attr_grp, > struct bin_attribute **hsmp_bin_attrs; > > /* Null terminated list of attributes */ > - hsmp_bin_attrs = devm_kzalloc(dev, sizeof(struct bin_attribute *) * > - (NUM_HSMP_ATTRS + 1), GFP_KERNEL); > + hsmp_bin_attrs = devm_kcalloc(dev, NUM_HSMP_ATTRS + 1, > + sizeof(struct bin_attribute *), While at it, it's better to match these sizeof()s with destination variable using sizeof(*hsmp_bin_attrs) construct. > + GFP_KERNEL); > if (!hsmp_bin_attrs) > return -ENOMEM; > > @@ -673,8 +674,9 @@ static int hsmp_create_non_acpi_sysfs_if(struct device *dev) > struct attribute_group *attr_grp; > u16 i; > > - hsmp_attr_grps = devm_kzalloc(dev, sizeof(struct attribute_group *) * > - (plat_dev.num_sockets + 1), GFP_KERNEL); > + hsmp_attr_grps = devm_kcalloc(dev, plat_dev.num_sockets + 1, > + sizeof(struct attribute_group *), > + GFP_KERNEL); > if (!hsmp_attr_grps) > return -ENOMEM; > > @@ -804,8 +806,8 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev) > * on each probe. > */ > if (!plat_dev.is_probed) { > - plat_dev.sock = devm_kzalloc(&pdev->dev, > - (plat_dev.num_sockets * sizeof(struct hsmp_socket)), > + plat_dev.sock = devm_kcalloc(&pdev->dev, plat_dev.num_sockets, > + sizeof(struct hsmp_socket), > GFP_KERNEL); > if (!plat_dev.sock) > return -ENOMEM; >
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c index 99bebb0ca5a9..f2247885c547 100644 --- a/drivers/platform/x86/amd/hsmp.c +++ b/drivers/platform/x86/amd/hsmp.c @@ -643,12 +643,12 @@ static int hsmp_init_metric_tbl_bin_attr(struct bin_attribute **hattrs, u16 sock hattrs[0] = hattr; if (plat_dev.proto_ver == HSMP_PROTO_VER6) - return (hsmp_get_tbl_dram_base(sock_ind)); + return hsmp_get_tbl_dram_base(sock_ind); else return 0; } -/* One bin sysfs for metrics table*/ +/* One bin sysfs for metrics table */ #define NUM_HSMP_ATTRS 1 static int hsmp_create_attr_list(struct attribute_group *attr_grp, @@ -657,8 +657,9 @@ static int hsmp_create_attr_list(struct attribute_group *attr_grp, struct bin_attribute **hsmp_bin_attrs; /* Null terminated list of attributes */ - hsmp_bin_attrs = devm_kzalloc(dev, sizeof(struct bin_attribute *) * - (NUM_HSMP_ATTRS + 1), GFP_KERNEL); + hsmp_bin_attrs = devm_kcalloc(dev, NUM_HSMP_ATTRS + 1, + sizeof(struct bin_attribute *), + GFP_KERNEL); if (!hsmp_bin_attrs) return -ENOMEM; @@ -673,8 +674,9 @@ static int hsmp_create_non_acpi_sysfs_if(struct device *dev) struct attribute_group *attr_grp; u16 i; - hsmp_attr_grps = devm_kzalloc(dev, sizeof(struct attribute_group *) * - (plat_dev.num_sockets + 1), GFP_KERNEL); + hsmp_attr_grps = devm_kcalloc(dev, plat_dev.num_sockets + 1, + sizeof(struct attribute_group *), + GFP_KERNEL); if (!hsmp_attr_grps) return -ENOMEM; @@ -804,8 +806,8 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev) * on each probe. */ if (!plat_dev.is_probed) { - plat_dev.sock = devm_kzalloc(&pdev->dev, - (plat_dev.num_sockets * sizeof(struct hsmp_socket)), + plat_dev.sock = devm_kcalloc(&pdev->dev, plat_dev.num_sockets, + sizeof(struct hsmp_socket), GFP_KERNEL); if (!plat_dev.sock) return -ENOMEM;