Skip to content

Commit e05d81b

Browse files
masneybalexandrebelloni
authored andcommitted
rtc: m41t80: convert from round_rate() to determine_rate()
The round_rate() clk ops is deprecated, so migrate this driver from round_rate() to determine_rate() using the Coccinelle semantic patch on the cover letter of this series. Signed-off-by: Brian Masney <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexandre Belloni <[email protected]>
1 parent 394a4b9 commit e05d81b

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

drivers/rtc/rtc-m41t80.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -484,16 +484,17 @@ static unsigned long m41t80_sqw_recalc_rate(struct clk_hw *hw,
484484
return sqw_to_m41t80_data(hw)->freq;
485485
}
486486

487-
static long m41t80_sqw_round_rate(struct clk_hw *hw, unsigned long rate,
488-
unsigned long *prate)
487+
static int m41t80_sqw_determine_rate(struct clk_hw *hw,
488+
struct clk_rate_request *req)
489489
{
490-
if (rate >= M41T80_SQW_MAX_FREQ)
491-
return M41T80_SQW_MAX_FREQ;
492-
if (rate >= M41T80_SQW_MAX_FREQ / 4)
493-
return M41T80_SQW_MAX_FREQ / 4;
494-
if (!rate)
495-
return 0;
496-
return 1 << ilog2(rate);
490+
if (req->rate >= M41T80_SQW_MAX_FREQ)
491+
req->rate = M41T80_SQW_MAX_FREQ;
492+
else if (req->rate >= M41T80_SQW_MAX_FREQ / 4)
493+
req->rate = M41T80_SQW_MAX_FREQ / 4;
494+
else if (req->rate)
495+
req->rate = 1 << ilog2(req->rate);
496+
497+
return 0;
497498
}
498499

499500
static int m41t80_sqw_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -564,7 +565,7 @@ static const struct clk_ops m41t80_sqw_ops = {
564565
.unprepare = m41t80_sqw_unprepare,
565566
.is_prepared = m41t80_sqw_is_prepared,
566567
.recalc_rate = m41t80_sqw_recalc_rate,
567-
.round_rate = m41t80_sqw_round_rate,
568+
.determine_rate = m41t80_sqw_determine_rate,
568569
.set_rate = m41t80_sqw_set_rate,
569570
};
570571

0 commit comments

Comments
 (0)