Commit fe4211d2 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Hans de Goede

platform/x86: ISST: Shorten the assignments for power_domain_info

Instead of long lines for assignment to tpmi_sst->power_domain_info, use
a local variable pd_info and assign later. Also move the assignment
of number of resources after the assignment of pd_info.

No functional change is expected.
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20240423204619.3946901-7-srinivas.pandruvada@linux.intel.comReviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 8c5a689e
...@@ -1271,6 +1271,7 @@ static long isst_if_def_ioctl(struct file *file, unsigned int cmd, ...@@ -1271,6 +1271,7 @@ static long isst_if_def_ioctl(struct file *file, unsigned int cmd,
int tpmi_sst_dev_add(struct auxiliary_device *auxdev) int tpmi_sst_dev_add(struct auxiliary_device *auxdev)
{ {
struct tpmi_per_power_domain_info *pd_info;
bool read_blocked = 0, write_blocked = 0; bool read_blocked = 0, write_blocked = 0;
struct intel_tpmi_plat_info *plat_info; struct intel_tpmi_plat_info *plat_info;
struct device *dev = &auxdev->dev; struct device *dev = &auxdev->dev;
...@@ -1311,35 +1312,31 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev) ...@@ -1311,35 +1312,31 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev)
if (!tpmi_sst) if (!tpmi_sst)
return -ENOMEM; return -ENOMEM;
tpmi_sst->power_domain_info = devm_kcalloc(dev, num_resources, pd_info = devm_kcalloc(dev, num_resources, sizeof(*pd_info), GFP_KERNEL);
sizeof(*tpmi_sst->power_domain_info), if (!pd_info)
GFP_KERNEL);
if (!tpmi_sst->power_domain_info)
return -ENOMEM; return -ENOMEM;
tpmi_sst->number_of_power_domains = num_resources;
for (i = 0; i < num_resources; ++i) { for (i = 0; i < num_resources; ++i) {
struct resource *res; struct resource *res;
res = tpmi_get_resource_at_index(auxdev, i); res = tpmi_get_resource_at_index(auxdev, i);
if (!res) { if (!res) {
tpmi_sst->power_domain_info[i].sst_base = NULL; pd_info[i].sst_base = NULL;
continue; continue;
} }
tpmi_sst->power_domain_info[i].package_id = pkg; pd_info[i].package_id = pkg;
tpmi_sst->power_domain_info[i].power_domain_id = i; pd_info[i].power_domain_id = i;
tpmi_sst->power_domain_info[i].auxdev = auxdev; pd_info[i].auxdev = auxdev;
tpmi_sst->power_domain_info[i].write_blocked = write_blocked; pd_info[i].write_blocked = write_blocked;
tpmi_sst->power_domain_info[i].sst_base = devm_ioremap_resource(dev, res); pd_info[i].sst_base = devm_ioremap_resource(dev, res);
if (IS_ERR(tpmi_sst->power_domain_info[i].sst_base)) if (IS_ERR(pd_info[i].sst_base))
return PTR_ERR(tpmi_sst->power_domain_info[i].sst_base); return PTR_ERR(pd_info[i].sst_base);
ret = sst_main(auxdev, &tpmi_sst->power_domain_info[i]); ret = sst_main(auxdev, &pd_info[i]);
if (ret) { if (ret) {
devm_iounmap(dev, tpmi_sst->power_domain_info[i].sst_base); devm_iounmap(dev, pd_info[i].sst_base);
tpmi_sst->power_domain_info[i].sst_base = NULL; pd_info[i].sst_base = NULL;
continue; continue;
} }
...@@ -1350,6 +1347,8 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev) ...@@ -1350,6 +1347,8 @@ int tpmi_sst_dev_add(struct auxiliary_device *auxdev)
return -ENODEV; return -ENODEV;
tpmi_sst->package_id = pkg; tpmi_sst->package_id = pkg;
tpmi_sst->power_domain_info = pd_info;
tpmi_sst->number_of_power_domains = num_resources;
auxiliary_set_drvdata(auxdev, tpmi_sst); auxiliary_set_drvdata(auxdev, tpmi_sst);
mutex_lock(&isst_tpmi_dev_lock); mutex_lock(&isst_tpmi_dev_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment