This driver is using devm_regulator_register() so it is not necessary to save *rdev for clean up. Actually the pmic->rdev[id] is not used now.
Unified · Split
| @@ -991,9 +991,6 @@ static int palmas_ldo_registration(struct palmas_pmic *pmic, · 990 unmodified lines | |||
| 991 | return PTR_ERR(rdev); | 991 | return PTR_ERR(rdev); |
| 992 | } | 992 | } |
| 993 | 993 | ||
| 994 | /* Save regulator for cleanup */ | ||
| 995 | pmic->rdev[id] = rdev; | ||
| 996 | |||
| 997 | /* Initialise sleep/init values from platform data */ | 994 | /* Initialise sleep/init values from platform data */ |
| 998 | if (pdata) { | 995 | if (pdata) { |
| 999 | reg_init = pdata->reg_init[id]; | 996 | reg_init = pdata->reg_init[id]; |
| @@ -1101,9 +1098,6 @@ static int tps65917_ldo_registration(struct palmas_pmic *pmic, · 101 unmodified lines | |||
| 1101 | return PTR_ERR(rdev); | 1098 | return PTR_ERR(rdev); |
| 1102 | } | 1099 | } |
| 1103 | 1100 | ||
| 1104 | /* Save regulator for cleanup */ | ||
| 1105 | pmic->rdev[id] = rdev; | ||
| 1106 | |||
| 1107 | /* Initialise sleep/init values from platform data */ | 1101 | /* Initialise sleep/init values from platform data */ |
| 1108 | if (pdata) { | 1102 | if (pdata) { |
| 1109 | reg_init = pdata->reg_init[id]; | 1103 | reg_init = pdata->reg_init[id]; |
| @@ -1288,9 +1282,6 @@ static int palmas_smps_registration(struct palmas_pmic *pmic, · 178 unmodified lines | |||
| 1288 | pdev_name); | 1282 | pdev_name); |
| 1289 | return PTR_ERR(rdev); | 1283 | return PTR_ERR(rdev); |
| 1290 | } | 1284 | } |
| 1291 | |||
| 1292 | /* Save regulator for cleanup */ | ||
| 1293 | pmic->rdev[id] = rdev; | ||
| 1294 | } | 1285 | } |
| 1295 | 1286 | ||
| 1296 | return 0; | 1287 | return 0; |
| @@ -1395,9 +1386,6 @@ static int tps65917_smps_registration(struct palmas_pmic *pmic, · 98 unmodified lines | |||
| 1395 | pdev_name); | 1386 | pdev_name); |
| 1396 | return PTR_ERR(rdev); | 1387 | return PTR_ERR(rdev); |
| 1397 | } | 1388 | } |
| 1398 | |||
| 1399 | /* Save regulator for cleanup */ | ||
| 1400 | pmic->rdev[id] = rdev; | ||
| 1401 | } | 1389 | } |
| 1402 | 1390 | ||
| 1403 | return 0; | 1391 | return 0; |
| @@ -553,7 +553,6 @@ struct palmas_pmic { · 552 unmodified lines | |||
| 553 | struct palmas *palmas; | 553 | struct palmas *palmas; |
| 554 | struct device *dev; | 554 | struct device *dev; |
| 555 | struct regulator_desc desc[PALMAS_NUM_REGS]; | 555 | struct regulator_desc desc[PALMAS_NUM_REGS]; |
| 556 | struct regulator_dev *rdev[PALMAS_NUM_REGS]; | ||
| 557 | struct mutex mutex; | 556 | struct mutex mutex; |
| 558 | 557 | ||
| 559 | int smps123; | 558 | int smps123; |