Commit 84269edce742e20a97b29619d3b9163a45a2a244
1 parent
fd55bc009a
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
hwmon: (vt1211) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code. Cc: Juerg Haefliger <juergh@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Jean Delvare <khali@linux-fr.org>
Showing 1 changed file with 5 additions and 17 deletions Side-by-side Diff
drivers/hwmon/vt1211.c
| ... | ... | @@ -1148,19 +1148,18 @@ |
| 1148 | 1148 | struct resource *res; |
| 1149 | 1149 | int i, err; |
| 1150 | 1150 | |
| 1151 | - data = kzalloc(sizeof(struct vt1211_data), GFP_KERNEL); | |
| 1151 | + data = devm_kzalloc(dev, sizeof(struct vt1211_data), GFP_KERNEL); | |
| 1152 | 1152 | if (!data) { |
| 1153 | - err = -ENOMEM; | |
| 1154 | 1153 | dev_err(dev, "Out of memory\n"); |
| 1155 | - goto EXIT; | |
| 1154 | + return -ENOMEM; | |
| 1156 | 1155 | } |
| 1157 | 1156 | |
| 1158 | 1157 | res = platform_get_resource(pdev, IORESOURCE_IO, 0); |
| 1159 | - if (!request_region(res->start, resource_size(res), DRVNAME)) { | |
| 1160 | - err = -EBUSY; | |
| 1158 | + if (!devm_request_region(dev, res->start, resource_size(res), | |
| 1159 | + DRVNAME)) { | |
| 1161 | 1160 | dev_err(dev, "Failed to request region 0x%lx-0x%lx\n", |
| 1162 | 1161 | (unsigned long)res->start, (unsigned long)res->end); |
| 1163 | - goto EXIT_KFREE; | |
| 1162 | + return -EBUSY; | |
| 1164 | 1163 | } |
| 1165 | 1164 | data->addr = res->start; |
| 1166 | 1165 | data->name = DRVNAME; |
| 1167 | 1166 | |
| 1168 | 1167 | |
| ... | ... | @@ -1215,26 +1214,15 @@ |
| 1215 | 1214 | dev_err(dev, "Sysfs interface creation failed (%d)\n", err); |
| 1216 | 1215 | EXIT_DEV_REMOVE_SILENT: |
| 1217 | 1216 | vt1211_remove_sysfs(pdev); |
| 1218 | - release_region(res->start, resource_size(res)); | |
| 1219 | -EXIT_KFREE: | |
| 1220 | - platform_set_drvdata(pdev, NULL); | |
| 1221 | - kfree(data); | |
| 1222 | -EXIT: | |
| 1223 | 1217 | return err; |
| 1224 | 1218 | } |
| 1225 | 1219 | |
| 1226 | 1220 | static int __devexit vt1211_remove(struct platform_device *pdev) |
| 1227 | 1221 | { |
| 1228 | 1222 | struct vt1211_data *data = platform_get_drvdata(pdev); |
| 1229 | - struct resource *res; | |
| 1230 | 1223 | |
| 1231 | 1224 | hwmon_device_unregister(data->hwmon_dev); |
| 1232 | 1225 | vt1211_remove_sysfs(pdev); |
| 1233 | - platform_set_drvdata(pdev, NULL); | |
| 1234 | - kfree(data); | |
| 1235 | - | |
| 1236 | - res = platform_get_resource(pdev, IORESOURCE_IO, 0); | |
| 1237 | - release_region(res->start, resource_size(res)); | |
| 1238 | 1226 | |
| 1239 | 1227 | return 0; |
| 1240 | 1228 | } |