|
@@ -481,7 +481,8 @@ static int mid_thermal_probe(struct platform_device *pdev)
|
|
int i;
|
|
int i;
|
|
struct platform_info *pinfo;
|
|
struct platform_info *pinfo;
|
|
|
|
|
|
- pinfo = kzalloc(sizeof(struct platform_info), GFP_KERNEL);
|
|
|
|
|
|
+ pinfo = devm_kzalloc(&pdev->dev, sizeof(struct platform_info),
|
|
|
|
+ GFP_KERNEL);
|
|
if (!pinfo)
|
|
if (!pinfo)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
@@ -489,7 +490,6 @@ static int mid_thermal_probe(struct platform_device *pdev)
|
|
ret = mid_initialize_adc(&pdev->dev);
|
|
ret = mid_initialize_adc(&pdev->dev);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "ADC init failed");
|
|
dev_err(&pdev->dev, "ADC init failed");
|
|
- kfree(pinfo);
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -520,7 +520,6 @@ err:
|
|
thermal_zone_device_unregister(pinfo->tzd[i]);
|
|
thermal_zone_device_unregister(pinfo->tzd[i]);
|
|
}
|
|
}
|
|
configure_adc(0);
|
|
configure_adc(0);
|
|
- kfree(pinfo);
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -541,8 +540,6 @@ static int mid_thermal_remove(struct platform_device *pdev)
|
|
thermal_zone_device_unregister(pinfo->tzd[i]);
|
|
thermal_zone_device_unregister(pinfo->tzd[i]);
|
|
}
|
|
}
|
|
|
|
|
|
- kfree(pinfo);
|
|
|
|
-
|
|
|
|
/* Stop the ADC */
|
|
/* Stop the ADC */
|
|
return configure_adc(0);
|
|
return configure_adc(0);
|
|
}
|
|
}
|