@@ -2529,17 +2529,17 @@ static int regulator_ena_gpio_ctrl(struct regulator_dev *rdev, bool enable)
2529
2529
}
2530
2530
2531
2531
/**
2532
- * _regulator_enable_delay - a delay helper function
2532
+ * _regulator_delay_helper - a delay helper function
2533
2533
* @delay: time to delay in microseconds
2534
2534
*
2535
2535
* Delay for the requested amount of time as per the guidelines in:
2536
2536
*
2537
2537
* Documentation/timers/timers-howto.rst
2538
2538
*
2539
- * The assumption here is that regulators will never be enabled in
2539
+ * The assumption here is that these regulator operations will never used in
2540
2540
* atomic context and therefore sleeping functions can be used.
2541
2541
*/
2542
- static void _regulator_enable_delay (unsigned int delay )
2542
+ static void _regulator_delay_helper (unsigned int delay )
2543
2543
{
2544
2544
unsigned int ms = delay / 1000 ;
2545
2545
unsigned int us = delay % 1000 ;
@@ -2621,7 +2621,7 @@ static int _regulator_do_enable(struct regulator_dev *rdev)
2621
2621
s64 remaining = ktime_us_delta (end , ktime_get ());
2622
2622
2623
2623
if (remaining > 0 )
2624
- _regulator_enable_delay (remaining );
2624
+ _regulator_delay_helper (remaining );
2625
2625
}
2626
2626
2627
2627
if (rdev -> ena_pin ) {
@@ -2648,14 +2648,14 @@ static int _regulator_do_enable(struct regulator_dev *rdev)
2648
2648
/* If poll_enabled_time is set, poll upto the delay calculated
2649
2649
* above, delaying poll_enabled_time uS to check if the regulator
2650
2650
* actually got enabled.
2651
- * If the regulator isn't enabled after enable_delay has
2652
- * expired, return -ETIMEDOUT.
2651
+ * If the regulator isn't enabled after our delay helper has expired,
2652
+ * return -ETIMEDOUT.
2653
2653
*/
2654
2654
if (rdev -> desc -> poll_enabled_time ) {
2655
2655
unsigned int time_remaining = delay ;
2656
2656
2657
2657
while (time_remaining > 0 ) {
2658
- _regulator_enable_delay (rdev -> desc -> poll_enabled_time );
2658
+ _regulator_delay_helper (rdev -> desc -> poll_enabled_time );
2659
2659
2660
2660
if (rdev -> desc -> ops -> get_status ) {
2661
2661
ret = _regulator_check_status_enabled (rdev );
@@ -2674,7 +2674,7 @@ static int _regulator_do_enable(struct regulator_dev *rdev)
2674
2674
return - ETIMEDOUT ;
2675
2675
}
2676
2676
} else {
2677
- _regulator_enable_delay (delay );
2677
+ _regulator_delay_helper (delay );
2678
2678
}
2679
2679
2680
2680
trace_regulator_enable_complete (rdev_get_name (rdev ));
0 commit comments