TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware: arm_scpi: make scpi_probe completely device-managed

Browse Source 
Replace two remaining functions in probe with their devm versions.

Tested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Heiner Kallweit
2017-12-05 23:16:48 +01:00
committed by Sudeep Holla
parent c14f1db41d
commit 5abc7935ed
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/firmware/arm_scpi.c
View File

@@ -901,15 +901,10 @@ static void scpi_free_channels(void *data)
static int scpi_remove(struct platform_device *pdev) static int scpi_remove(struct platform_device *pdev)
{ {
int i; int i;
struct device *dev = &pdev->dev;
struct scpi_drvinfo *info = platform_get_drvdata(pdev); struct scpi_drvinfo *info = platform_get_drvdata(pdev);
scpi_info = NULL; /* stop exporting SCPI ops through get_scpi_ops */ scpi_info = NULL; /* stop exporting SCPI ops through get_scpi_ops */
of_platform_depopulate(dev);
sysfs_remove_groups(&dev->kobj, versions_groups);
platform_set_drvdata(pdev, NULL);
for (i = 0; i < MAX_DVFS_DOMAINS && info->dvfs[i]; i++) { for (i = 0; i < MAX_DVFS_DOMAINS && info->dvfs[i]; i++) {
kfree(info->dvfs[i]->opps); kfree(info->dvfs[i]->opps);
kfree(info->dvfs[i]); kfree(info->dvfs[i]);
@@ -1036,7 +1031,6 @@ static int scpi_probe(struct platform_device *pdev)
ret = scpi_init_versions(scpi_info); ret = scpi_init_versions(scpi_info);
if (ret) { if (ret) {
dev_err(dev, "incorrect or no SCP firmware found\n"); dev_err(dev, "incorrect or no SCP firmware found\n");
scpi_remove(pdev);
return ret; return ret;
} }
@@ -1048,11 +1042,11 @@ static int scpi_probe(struct platform_device *pdev)
FW_REV_PATCH(scpi_info->firmware_version)); FW_REV_PATCH(scpi_info->firmware_version));
scpi_info->scpi_ops = &scpi_ops; scpi_info->scpi_ops = &scpi_ops;
ret = sysfs_create_groups(&dev->kobj, versions_groups); ret = devm_device_add_groups(dev, versions_groups);
if (ret) if (ret)
dev_err(dev, "unable to create sysfs version group\n"); dev_err(dev, "unable to create sysfs version group\n");
return of_platform_populate(dev->of_node, NULL, NULL, dev); return devm_of_platform_populate(dev);
} }
static const struct of_device_id scpi_of_match[] = { static const struct of_device_id scpi_of_match[] = {